Follow-up for ca121e20. Fixes #17568.
mentioned in commit 376a9f69
mentioned in commit d8e9580a
mentioned in commit 0f428f71
mentioned in commit dcff070d
mentioned in commit a8437c07