8143931: Back out JDK-8140450

Reviewed-by: coleenp
14 files changed