Revert for now "Some changes added to compile and run with Java 6 and Java 7."

This reverts commit 7a4a47431f0a7877f5a00e572901c9d7910f7735.