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

This reverts commit ebbb24a04af87bc044d03562ba7934c3809910cc.