Revert back dial timeout, add TLS handshake timeout.