Reverted some Java 7 code to Java 6.
Stupid stuff to allow it to compile.