2379c52210
This will do as a stop-gap until I figure out a more fault-tolerant way of having deferred closes against the control connection work without blocking.