Yet again, revert auto-whitespace fixes