This reverts commit 332c46ff. We need the protocol negotiator exposed for alternative handshake/security mechanisms.