Back to Java 7