Changed back to JDK7