--- a/src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java	Wed Oct 12 18:12:12 2016 -0600
+++ b/src/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java	Wed Oct 12 19:47:45 2016 -0600
@@ -35,6 +35,7 @@
 import org.eclipse.jetty.io.RuntimeIOException;
 import org.eclipse.jetty.io.nio.AsyncConnection;
 import org.eclipse.jetty.io.nio.SslConnection;
+import org.eclipse.jetty.io.nio.SelectChannelEndPoint;
 import org.eclipse.jetty.server.Request;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.nio.SelectChannelConnector;
@@ -530,15 +531,14 @@
 		return true;
 	}
 
-	/* ------------------------------------------------------------------------------- */
 	@Override
 	protected AsyncConnection newConnection(SocketChannel channel, AsyncEndPoint endpoint)
 	{
 		try
 		{
 			SSLEngine engine = createSSLEngine(channel);
-			SslConnection connection = newSslConnection(endpoint, engine);
-			AsyncConnection delegate = newPlainConnection(channel, connection.getSslEndPoint());
+			SslConnection connection = new SslConnection(engine, endpoint);
+			AsyncConnection delegate = super.newConnection(channel, connection.getSslEndPoint());
 			connection.getSslEndPoint().setConnection(delegate);
 			connection.setAllowRenegotiate(_sslContextFactory.isAllowRenegotiate());
 			return connection;
@@ -549,16 +549,6 @@
 		}
 	}
 
-	protected AsyncConnection newPlainConnection(SocketChannel channel, AsyncEndPoint endPoint)
-	{
-		return super.newConnection(channel, endPoint);
-	}
-
-	protected SslConnection newSslConnection(AsyncEndPoint endpoint, SSLEngine engine)
-	{
-		return new SslConnection(engine, endpoint);
-	}
-
 	/* ------------------------------------------------------------ */
 	/**
 	 * @param channel A channel which if passed is used as to extract remote