ISIS-592: removing accidental dependency on JDK7.