Fix build on Mac JDK 7 again