Back to Java 1.6 compliance