jdk 1.6 fixes
Revert "changed config"

This reverts commit bfd35bbde8cba92fbe53809ce08edb4fb614381b.
Merge branch 'KaeruCT'
...