diff --git a/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java b/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
index e6fa71e75..44f3f53fb 100644
--- a/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
+++ b/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java
@@ -43,7 +43,6 @@
 import org.apache.http.HttpRequest;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpResponseFactory;
-import org.apache.http.message.LineParser;
 import org.apache.http.params.HttpParams;
 import org.apache.http.impl.SocketHttpClientConnection;
 import org.apache.http.io.HttpMessageParser;
@@ -81,9 +80,6 @@ public class DefaultClientConnection extends SocketHttpClientConnection
     /** Whether this connection is secure. */
     private boolean connSecure;
 
-    /** The line parser to use, or <code>null</code> for the default parser. */
-    private LineParser lineParser;
-
 
     // public default constructor
 
@@ -134,26 +130,6 @@ public void shutdown() throws IOException {
 
     } // shutdown
 
-
-    /**
-     * Obtains the line parser to be used for receiving messages.
-     *
-     * @return  the line parser, or <code>null</code> for the default
-     */
-    public LineParser getParser() {
-        return lineParser;
-    }
-
-    /**
-     * Specifies the line parser to use when receiving messages.
-     *
-     * @param parser    the line parser to use, or
-     *                  <code>null</code> for the default
-     */
-    public final void setParser(LineParser parser) {
-        lineParser = parser;
-    }
-
     
     public void close() throws IOException {
         LOG.debug("Connection closed");
@@ -196,7 +172,7 @@ protected HttpMessageParser createResponseParser(
             final HttpResponseFactory responseFactory, 
             final HttpParams params) {
         return new DefaultResponseParser
-            (buffer, lineParser, responseFactory, params);
+            (buffer, getLineParser(), responseFactory, params);
     }
 
 
diff --git a/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java b/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
index f9b3b3cad..e3b8bc6e4 100644
--- a/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
+++ b/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java
@@ -96,7 +96,7 @@ public DefaultClientConnectionOperator(SchemeRegistry schemes) {
      *
      * @return  the line parser, or <code>null</code> for the default
      */
-    public LineParser getParser() {
+    public LineParser getLineParser() {
         return lineParser;
     }
 
@@ -106,7 +106,7 @@ public LineParser getParser() {
      *
      * @param parser    the line parser, or <code>null</code> for the default
      */
-    public void setParser(LineParser parser) {
+    public void setLineParser(LineParser parser) {
         lineParser = parser;
     }
 
@@ -114,7 +114,7 @@ public void setParser(LineParser parser) {
     // non-javadoc, see interface ClientConnectionOperator
     public OperatedClientConnection createConnection() {
         DefaultClientConnection dcc = new DefaultClientConnection();
-        dcc.setParser(lineParser);
+        dcc.setLineParser(lineParser);
         return dcc;
     }