JRE-420 bring back the fix JDK-8068886
2 files changed