Revert and try again.

I hit ^C in the middle, interrupting it, so was likely a partial commit.