Clean backport of https://git.openjdk.org/jdk/pull/14813
------------- Commit messages: - Backport 6569b252b9e61e3eed77039c483529154feffbba Changes: https://git.openjdk.org/jdk21/pull/107/files Webrev: https://webrevs.openjdk.org/?repo=jdk21&pr=107&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8311593 Stats: 2 lines in 1 file changed: 0 ins; 0 del; 2 mod Patch: https://git.openjdk.org/jdk21/pull/107.diff Fetch: git fetch https://git.openjdk.org/jdk21.git pull/107/head:pull/107 PR: https://git.openjdk.org/jdk21/pull/107
