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

This reverts commit 74ff0761f930351b647d57d5e64932bff9edc9ac.

Change-Id: If0f227651c05f1d8f8339475549b07a58431cd0d