Reverting to Java 1.6