Revert "Use Java 1.6"

This reverts commit 8d4d61a1ee3b337dd414cb2ed9df52f960aa8935.