Revert a bunch of accidental changes.