Reverted to Java 7