revert last commit which causes compiler error due to JDK incompatibility