Undo whitespace cleanups in my commit.