This reverts commit 3971f648 and a
couple of followon debugging commits; I think we've learned what we can
from them.