Commented out java7 dependencies.

Giving us a java6-clean starting point.