Hopefully I didn't do anything stupid. (Revert and fix and stuff if so, I guess.) This was SVN commit r4666.