Revert "Updates for Java 7"

This reverts commit f75070e178c49f80cd80d127d2044cd247cfccee.
fix repo