Revert "FIX wrong connection termination on start"

This reverts commit 27dc420da864a31c22288a4f677737c8a58ba6c9.