Revert pointless reindents to avoid merge conflicts.