--- a/src/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java	Sat Oct 08 23:57:11 2016 -0600
+++ b/src/org/eclipse/jetty/io/nio/SelectChannelEndPoint.java	Sun Oct 09 01:22:55 2016 -0600
@@ -133,10 +133,7 @@
 	/* ------------------------------------------------------------ */
 	public void setConnection(Connection connection)
 	{
-		Connection old=_connection;
 		_connection=(AsyncConnection)connection;
-		if (old!=null && old!=_connection)
-			_manager.endPointUpgraded(this,old);
 	}
 
 	/* ------------------------------------------------------------ */
@@ -197,10 +194,6 @@
 			{
 				// other wise do the dispatch
 				dispatch();
-				if (_state>=STATE_DISPATCHED && !_selectSet.getManager().isDeferringInterestedOps0())
-				{
-					_key.interestOps(0);
-				}
 			}
 		}
 	}
@@ -698,9 +691,7 @@
 						if (next!=_connection)
 						{
 							LOG.debug("{} replaced {}",next,_connection);
-							Connection old=_connection;
 							_connection=next;
-							_manager.endPointUpgraded(this,old);
 							continue;
 						}
 						break;