--- a/src/org/eclipse/jetty/server/AbstractHttpConnection.java	Tue Oct 04 16:04:32 2016 -0600
+++ b/src/org/eclipse/jetty/server/AbstractHttpConnection.java	Tue Oct 04 16:12:50 2016 -0600
@@ -53,7 +53,6 @@
 import org.eclipse.jetty.io.EndPoint;
 import org.eclipse.jetty.io.EofException;
 import org.eclipse.jetty.io.RuntimeIOException;
-import org.eclipse.jetty.io.UncheckedPrintWriter;
 import org.eclipse.jetty.server.handler.ErrorHandler;
 import org.eclipse.jetty.server.nio.NIOConnector;
 import org.eclipse.jetty.server.ssl.SslConnector;
@@ -366,26 +365,23 @@
 		if (_writer==null)
 		{
 			_writer=new OutputWriter();
-			if (_server.isUncheckedPrintWriter())
-				_printWriter=new UncheckedPrintWriter(_writer);
-			else
-				_printWriter = new PrintWriter(_writer)
+			_printWriter = new PrintWriter(_writer)
+			{
+				public void close()
 				{
-					public void close()
+					synchronized (lock)
 					{
-						synchronized (lock)
+						try
 						{
-							try
-							{
-								out.close();
-							}
-							catch (IOException e)
-							{
-								setError();
-							}
+							out.close();
+						}
+						catch (IOException e)
+						{
+							setError();
 						}
 					}
-				};
+				}
+			};
 		}
 		_writer.setCharacterEncoding(encoding);
 		return _printWriter;