8236070: Backout fix for JDK-8234465

Reviewed-by: mullan
4 files changed