Revert to Java6 support again
Merge pull request #549 from dlsniper/revert-java6

Revert to Java6 support again