Complete downgrade to Java 6 (issue #44)