Revert "Fix JDK9 compilation"