Revert JDK 8 for now