Remove nice new options to ensure it still compiles with Java 6.
Temporary fix.