Revert "[Truffle] Back out of commit that merged in Truffle 0.4, as it's broken for Java 7."

This reverts commit ffaf8f0d9670c9c410779b41eaa1c8587b2204ab.