8175086: [BACKOUT] fix for JDK-8166188

Reviewed-by: kbarrett, jwilhelm, dcubed
37 files changed