Revert "Remove 'Redundant tpye specification' warnings"

This reverts commit 606dc072d6ea6573dacbe47bd53f0765b59a9ec7.
Revert "Upgrade to Java 1.7"

This reverts commit 4979a3cf30a5f95c308f148f6d7b7bd0b9a89d44.