Revert of JDK-7162125 because of found regressions

--HG--
branch : 8u40-verified-fixes
14 files changed