Reverted to java 1.6