Revert to JDK 1.7