Fixes #22981.
mentioned in commit cef004a2
mentioned in commit 94b5fdd8
mentioned in commit 0a71bf22
mentioned in commit 463bd592