Downgrade to Java 6 again to (attempt to) fix build