Revert to JDK 7_21