Revert to java 1.7