Reverted to JDK7