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

This reverts commit eded3983484229204f84b484409e7c1fec0a3ab2.

Change-Id: I0c1c13cde115a0f738a292a2b19a45813ed92f89