Revert "Switched from Java 1.7 to Java 1.6"

This reverts commit 5a1a5247dc5f1fc83b7fc6cf9f9f8ca220fcc215.