8061826: Part of JDK-8060474 should be reverted

Reviewed-by: mullan, ahgross
2 files changed