Continued downgrade to Java 1.7