Add JDK6 fallback when the java7 marker is removed