Reverting to Java 7 again.