diff --git a/CHANGES.txt b/CHANGES.txt
index ac6d728ba95..51ea232196d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -357,6 +357,7 @@ Bug Fixes
 
 27. SOLR-267: Changed logging to report number of hits, and also provide a mechanism to add log messages to be output by the SolrCore via a NamedList toLog
     member variable.  (Will Johnson, yseeley, gsingers)
+   SOLR-267: Removed adding values to the HTTP headers in SolrDispatchFilter (gsingers)
 
 28. SOLR-509: Moved firstSearcher event notification to the end of the SolrCore constructor (Koji Sekiguchi via gsingers)
 
diff --git a/src/java/org/apache/solr/request/SolrQueryResponse.java b/src/java/org/apache/solr/request/SolrQueryResponse.java
index ccb162e0d87..736ffbf5196 100644
--- a/src/java/org/apache/solr/request/SolrQueryResponse.java
+++ b/src/java/org/apache/solr/request/SolrQueryResponse.java
@@ -79,7 +79,6 @@ public class SolrQueryResponse {
   ***/
 
   public SolrQueryResponse() {
-	  add("responseHeader", new SimpleOrderedMap<Object>());
   }
   
   
diff --git a/src/test/org/apache/solr/request/JSONWriterTest.java b/src/test/org/apache/solr/request/JSONWriterTest.java
index 87c7522850d..ddf995ec2e1 100644
--- a/src/test/org/apache/solr/request/JSONWriterTest.java
+++ b/src/test/org/apache/solr/request/JSONWriterTest.java
@@ -42,12 +42,12 @@ public class JSONWriterTest extends AbstractSolrTestCase {
     rsp.add("data2", Double.NEGATIVE_INFINITY);
     rsp.add("data3", Float.POSITIVE_INFINITY);
     w.write(buf, req, rsp);
-    assertEquals(buf.toString(), "{'responseHeader':{},'data1':float('NaN'),'data2':-float('Inf'),'data3':float('Inf')}");
+    assertEquals(buf.toString(), "{'data1':float('NaN'),'data2':-float('Inf'),'data3':float('Inf')}");
 
     w = new RubyResponseWriter();
     buf = new StringWriter();
     w.write(buf, req, rsp);
-    assertEquals(buf.toString(), "{'responseHeader'=>{},'data1'=>(0.0/0.0),'data2'=>-(1.0/0.0),'data3'=>(1.0/0.0)}");
+    assertEquals(buf.toString(), "{'data1'=>(0.0/0.0),'data2'=>-(1.0/0.0),'data3'=>(1.0/0.0)}");
 
   }
   
diff --git a/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java b/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
index bcb9baed110..664d7f2793d 100644
--- a/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -273,14 +273,15 @@ public class SolrDispatchFilter implements Filter
                  */
                 this.execute( req, handler, solrReq, solrRsp );
               // add info to http headers
-                try {
+              //TODO: See SOLR-232 and SOLR-267.  
+                /*try {
                   NamedList solrRspHeader = solrRsp.getResponseHeader();
                  for (int i=0; i<solrRspHeader.size(); i++) {
                    ((javax.servlet.http.HttpServletResponse) response).addHeader(("Solr-" + solrRspHeader.getName(i)), String.valueOf(solrRspHeader.getVal(i)));
                  }
                 } catch (ClassCastException cce) {
                   log.log(Level.WARNING, "exception adding response header log information", cce);
-                }
+                }*/
                 if( solrRsp.getException() != null ) {
                   sendError( (HttpServletResponse)response, solrRsp.getException() );
                 }