Switched back to JDK 1.6