Switch back to Java 7