[11u] RFR/A: 8245649: Revert 8245397 backport of 8230591

[Hohensee, Paul]

8245397, the backport of 8230591 to 11u, failed. This review request is to revert it.

Reversion bug: https://bugs.openjdk.java.net/browse/JDK-8245649
Reversion webrev: http://cr.openjdk.java.net/~phh/8245649/webrev.00/

Backport bug: https://bugs.openjdk.java.net/browse/JDK-8245397
Backport patch: https://hg.openjdk.java.net/jdk-updates/jdk11u-dev/rev/568a1e923d62

Thanks,
Paul