Goddammit, I hate two-space indentation, but it's messing up the diffs. Reverting it.