3901: Revert whitespace changes

This isn't the branch for cleaning up all the whitespace.