Clean backport of https://git.openjdk.org/jdk/pull/14679
------------- Commit messages: - Backport 623cfcd04b0c4662e614cb6a3bf52536abc02d5a Changes: https://git.openjdk.org/jdk21/pull/113/files Webrev: https://webrevs.openjdk.org/?repo=jdk21&pr=113&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8310892 Stats: 60 lines in 1 file changed: 12 ins; 6 del; 42 mod Patch: https://git.openjdk.org/jdk21/pull/113.diff Fetch: git fetch https://git.openjdk.org/jdk21.git pull/113/head:pull/113 PR: https://git.openjdk.org/jdk21/pull/113