Reverted back to Java 1.6.