This reverts commit 965e3b4c, reversing
changes made to 1a7d2a06.

I accidentally merged this before it was ready.  This was silly, so now I'm undoing it.  We'll need to revert the revert later.