Back to JDK 1.6