Revert my changes for #416; they break unit tests.  It seems I don't
understand this as well as I thought I did.