Fixes #9330, I think. If it was even still an issue. (cherry picked from commit 3aead3a2a924ae080b8fa5dbfdef15b91010d2c9)