Remove JDK7 calls - again. Supporting JDK6 is still important.