Update for closure and linked failure changes.
Remove sketchy reconnect thingy.