diff --git a/jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java b/jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
index 3a5eb61d29f..cc91299e522 100644
--- a/jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
+++ b/jetty-client/src/main/java/org/eclipse/jetty/client/SelectConnector.java
@@ -273,7 +273,7 @@ class SelectConnector extends AbstractLifeCycle implements HttpClient.Connector
             ((SelectChannelEndPoint)_endp).setConnection(sslConnection);
 
             _endp=sslConnection.getSslEndPoint();
-            sslConnection.setConnection(connection);
+            sslConnection.getSslEndPoint().setConnection(connection);
             
             LOG.debug("upgrade {} to {} for {}",this,sslConnection,connection);
         }
diff --git a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
index 6808206b7b8..36b33d75259 100644
--- a/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
+++ b/jetty-io/src/main/java/org/eclipse/jetty/io/nio/SslConnection.java
@@ -98,18 +98,6 @@ public class SslConnection extends AbstractConnection implements AsyncConnection
         _aEndp=(AsyncEndPoint)endp;
     }
 
-    /* ------------------------------------------------------------ */
-    public synchronized void setConnection(AsyncConnection connection)
-    {
-        _connection=connection;
-    }
-
-    /* ------------------------------------------------------------ */
-    public synchronized AsyncConnection getConnection()
-    {
-        return _connection;
-    }
-
     /* ------------------------------------------------------------ */
     /**
      * @return True if SSL re-negotiation is allowed (default false)
diff --git a/jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java b/jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java
index bb08e4de2b7..dad39ac900f 100644
--- a/jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java
+++ b/jetty-io/src/test/java/org/eclipse/jetty/io/nio/SelectChannelEndPointSslTest.java
@@ -49,7 +49,7 @@ public class SelectChannelEndPointSslTest extends SelectChannelEndPointTest
         SslConnection connection = new SslConnection(engine,endpoint);
 
         AsyncConnection delegate = super.newConnection(channel,connection.getSslEndPoint());
-        connection.setConnection(delegate);
+        connection.getSslEndPoint().setConnection(delegate);
         return connection;
     }
 
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java
index 6f3de548f18..7fd6a27432b 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/ssl/SslSelectChannelConnector.java
@@ -559,7 +559,7 @@ public class SslSelectChannelConnector extends SelectChannelConnector implements
             SslConnection connection = new SslConnection(engine,endpoint);
 
             AsyncConnection delegate = super.newConnection(channel,connection.getSslEndPoint());
-            connection.setConnection(delegate);
+            connection.getSslEndPoint().setConnection(delegate);
             connection.setAllowRenegotiate(_sslContextFactory.isAllowRenegotiate());
             return connection;
         }