move back to jdk 1.6 compatibility