Revert Java 1.7 for now due to compilation errors