a8ecdca826
Fixes #33372
(cherry picked from commit 889d4683a1)
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>