--- a/src/org/eclipse/jetty/server/handler/ContextHandler.java	Sat Oct 08 21:30:32 2016 -0600
+++ b/src/org/eclipse/jetty/server/handler/ContextHandler.java	Sat Oct 08 21:37:13 2016 -0600
@@ -132,7 +132,6 @@
 	private MimeTypes _mimeTypes;
 	private Map<String, String> _localeEncodingMap;
 	private String[] _welcomeFiles;
-	private ErrorHandler _errorHandler;
 	private String[] _vhosts;
 	private Set<String> _connectors;
 	private EventListener[] _eventListeners;
@@ -245,19 +244,6 @@
 	}
 
 	/* ------------------------------------------------------------ */
-	@Override
-	public void setServer(Server server)
-	{
-		if (_errorHandler != null)
-		{
-			super.setServer(server);
-			_errorHandler.setServer(server);
-		}
-		else
-			super.setServer(server);
-	}
-
-	/* ------------------------------------------------------------ */
 	/**
 	 * Set the virtual hosts for the context. Only requests that have a matching host header or fully qualified URL will be passed to that context with a
 	 * virtual host name. A context with no virtual host names or a null virtual host name is available to all requests that are not served by a context with a
@@ -755,9 +741,6 @@
 
 		super.doStart();
 
-		if (_errorHandler != null)
-			_errorHandler.start();
-
 		// Context listeners
 		if (_contextListeners != null)
 		{
@@ -821,9 +804,6 @@
 			setEventListeners((EventListener[])LazyList.toArray(_durableListeners, EventListener.class));
 			_durableListeners = null;
 
-			if (_errorHandler != null)
-				_errorHandler.stop();
-
 			Enumeration e = _scontext.getAttributeNames();
 			while (e.hasMoreElements())
 			{
@@ -1399,27 +1379,6 @@
 	}
 
 	/* ------------------------------------------------------------ */
-	/**
-	 * @return Returns the errorHandler.
-	 */
-	public ErrorHandler getErrorHandler()
-	{
-		return _errorHandler;
-	}
-
-	/* ------------------------------------------------------------ */
-	/**
-	 * @param errorHandler
-	 *            The errorHandler to set.
-	 */
-	public void setErrorHandler(ErrorHandler errorHandler)
-	{
-		if (errorHandler != null)
-			errorHandler.setServer(getServer());
-		_errorHandler = errorHandler;
-	}
-
-	/* ------------------------------------------------------------ */
 	public int getMaxFormContentSize()
 	{
 		return _maxFormContentSize;