r17168: Now that TLS (and soon SASL) is below the socket layer, we need to