reverted to Java 7