diff --git a/rest_framework/templates/rest_framework/base.html b/rest_framework/templates/rest_framework/base.html
index 7f16482b7..e261d8c9d 100644
--- a/rest_framework/templates/rest_framework/base.html
+++ b/rest_framework/templates/rest_framework/base.html
@@ -176,7 +176,7 @@
 
               <div class="response-info" aria-label="{% trans "response info" %}">
                 <pre class="prettyprint"><span class="meta nocode"><b>HTTP {{ response.status_code }} {{ response.status_text }}</b>{% for key, val in response_headers|items %}
-<b>{{ key }}:</b> <span class="lit">{{ val|break_long_headers|urlize }}</span>{% endfor %}
+<b>{{ key }}:</b> <span class="lit">{{ val|urlize }}</span>{% endfor %}
 
 </span>{{ content|urlize }}</pre>
               </div>
diff --git a/rest_framework/templatetags/rest_framework.py b/rest_framework/templatetags/rest_framework.py
index dba8153b1..3ff74e7cc 100644
--- a/rest_framework/templatetags/rest_framework.py
+++ b/rest_framework/templatetags/rest_framework.py
@@ -313,14 +313,3 @@ def smart_urlquote_wrapper(matched_url):
         return smart_urlquote(matched_url)
     except ValueError:
         return None
-
-
-@register.filter
-def break_long_headers(header):
-    """
-    Breaks headers longer than 160 characters (~page length)
-    when possible (are comma separated)
-    """
-    if len(header) > 160 and ',' in header:
-        header = mark_safe('<br> ' + ', <br>'.join(escape(header).split(',')))
-    return header
diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py
index 4b84f6647..7134c1bae 100644
--- a/tests/test_templatetags.py
+++ b/tests/test_templatetags.py
@@ -8,8 +8,8 @@ from rest_framework.compat import coreapi, coreschema
 from rest_framework.relations import Hyperlink
 from rest_framework.templatetags import rest_framework
 from rest_framework.templatetags.rest_framework import (
-    add_nested_class, add_query_param, as_string, break_long_headers,
-    format_value, get_pagination_html, schema_links
+    add_nested_class, add_query_param, as_string, format_value,
+    get_pagination_html, schema_links
 )
 from rest_framework.test import APIRequestFactory
 
@@ -234,11 +234,6 @@ class TemplateTagTests(TestCase):
         get_pagination_html(pager)
         assert pager.called is True
 
-    def test_break_long_lines(self):
-        header = 'long test header,' * 20
-        expected_header = '<br> ' + ', <br>'.join(header.split(','))
-        assert break_long_headers(header) == expected_header
-
 
 class Issue1386Tests(TestCase):
     """