Revert move to Java 8