Revert "Merge pull request #155 from yawkat/killed-connections-fix"

This reverts commit ce42d88219cd85494406b6ebafb6673a39c66415, reversing
changes made to c3eeab45cd959f9abf735998a091a58dd662fe8b.