9d0e4efd9b
Fixes #45938
(cherry picked from commit 843e587a05)
Co-authored-by: Marcus Efraimsson <marcus.efraimsson@gmail.com>