Revert again to oracle jdk 7