This is a horrifically bad merge! I thought I'd run the tests...

I'm gonna redo the merge.