Fixes #10347, this time for real.

Created by: icantthinkofanameritenow

Now with no conflicts. My bad, turns out my bleeding edge branch wasn't updated right.

Fixes #10347 (closed)