Switch back to Java 1.6