8190442: Backout changes for JDK-8087291 from 8u-dev as it didn't use main CR id

Backed out changeset 7f32cc0fa9ec

Reviewed-by: asaha
2 files changed