Revert Java 1.7