Restore broken disconnect semantics