Reverted to JDK1.6