Reverted to java 7
Reverted to java 7