Somehow this layout worked it's way back into that last commit

Shun the non-believer (in backporting). SHUUUUUUN!