Revert "made it java 6 compatible"

This reverts commit b481f7cf3d4e260c82ef773769a08f9a0b5fc575.
Revert "Fixed merge conflicts"

This reverts commit cfaefdabd60b67a67467ddb4dcb270abb7dac9e2, reversing
changes made to e78231a6222dfe5c814d16d97acfb39b567b83d4.
reverted to previous versioN