Try to simplify apoptosis/DeleteConnection locking mess.
(cherry picked from commit 07210656defa5245b1ad80871860d196a8f93a74)