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

This reverts commit e27daed26e8dac0e015f2dee5488e2d1bc7836da.