Rolled compatibility down to JDK6