Revert "Remove connection timeout"

This reverts commit c2823df9b0cce7f91c4ee79fd70c93418672ac03.