Switch to the Java6 version