[8u-dev] RFR+RFA (S): JDK-8225065: Revert 8221166 (8u backport of 8048782)

[Hohensee, Paul]

Please review and approve.

Bug: https://bugs.openjdk.java.net/browse/JDK-8225065
Webrev: http://cr.openjdk.java.net/~phh/8225065/webrev.8u.00/
Reverted bug: https://bugs.openjdk.java.net/browse/JDK-8221166
Reverted patch: http://hg.openjdk.java.net/jdk8u/jdk8u/jdk/rev/d9da27985291
Discussion: https://mail.openjdk.java.net/pipermail/jdk8u-dev/2019-May/009349.html

Thanks,

Paul