Revert again, this time without post-commit reindent hooks to put back the indentatio...