Move back to Java 6 for now...