This reverts commit 206fa603 (which was
itself a revert commit), re-applying the change now that surrounding
code is ready for it.