Add back JDK6 support.