776bd6c27d
Fixes #8168, I think. (cherry picked from commit ab6dfe9e256dafc9085617aba0a094462eef1337)
Fixes #8168, I think. (cherry picked from commit ab6dfe9e256dafc9085617aba0a094462eef1337)