Fix whitespace nonsense
Ported 7162df6477 to our stable branch