Reverted effort to cheat openjdk6 compiler