Reverted to Java 6.