Rolled back compatibility supprot to JDK6