Reverting to Java 7