Revert whatever weirdness has been going on.

A bunch of stuff was lost in that last botched merge. When a manual merge is
required, you need to go in and take the changes we want (code from different
heads of the merge will be marked with <<< === >>>) and git commit again before
pushing.