Revert to JDK 1.7 for compatibility