[jdk21u-dev] RFR: 8336692: Redo fix for JDK-8284620

[Goetz Lindenmaier]

I backport this for parity with 21.0.6-oracle.

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

Commit messages:
 - Backport c5b7af73d07f7458e970f5752eb75640562ddc7b

Changes: https://git.openjdk.org/jdk21u-dev/pull/1229/files
  Webrev: https://webrevs.openjdk.org/?repo=jdk21u-dev&pr=1229&range=00
  Issue: https://bugs.openjdk.org/browse/JDK-8336692
  Stats: 6 lines in 1 file changed: 2 ins; 3 del; 1 mod
  Patch: https://git.openjdk.org/jdk21u-dev/pull/1229.diff
  Fetch: git fetch https://git.openjdk.org/jdk21u-dev.git pull/1229/head:pull/1229

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