[jdk21u-dev] RFR: 8376270: [21u, 17u] Redo JDK-8361748

[Goetz Lindenmaier]

This reverts commit 12bf7aa102bd3ea69df4ddb94b894917256280d4.

Clean redo of the backout.

-------------

Commit messages:
 - 8376270: [21u, 17u] Redo JDK-8361748

Changes: https://git.openjdk.org/jdk21u-dev/pull/2574/files
  Webrev: https://webrevs.openjdk.org/?repo=jdk21u-dev&pr=2574&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8376270
  Stats: 245 lines in 7 files changed: 157 ins; 33 del; 55 mod
  Patch: https://git.openjdk.org/jdk21u-dev/pull/2574.diff
  Fetch: git fetch https://git.openjdk.org/jdk21u-dev.git pull/2574/head:pull/2574

PR: https://git.openjdk.org/jdk21u-dev/pull/2574