diff --git a/pywb/rewrite/header_rewriter.py b/pywb/rewrite/header_rewriter.py
index 4c161186..610df546 100644
--- a/pywb/rewrite/header_rewriter.py
+++ b/pywb/rewrite/header_rewriter.py
@@ -166,9 +166,6 @@ class HeaderRewriter(object):
                 else:
                     add_prefixed_header(name, value)
 
-            elif lowername.startswith('x-'):
-                add_header(name, value)
-
             elif urlrewriter:
                 add_prefixed_header(name, value)
             else:
diff --git a/pywb/rewrite/test/test_header_rewriter.py b/pywb/rewrite/test/test_header_rewriter.py
index e3a052e6..8e1f1a87 100644
--- a/pywb/rewrite/test/test_header_rewriter.py
+++ b/pywb/rewrite/test/test_header_rewriter.py
@@ -39,7 +39,7 @@ HTTP Headers Rewriting
   ('Set-Cookie', 'foo=bar; Path=/web/20131010/http://example.com/'),
   ('Content-Encoding', 'gzip'),
   ('X-Archive-Orig-Transfer-Encoding', 'chunked'),
-  ('X-Proxy', 'test')]),
+  ('X-Archive-Orig-X-Proxy', 'test')]),
  'text_type': None}
 
 """
diff --git a/tests/test_live_proxy.py b/tests/test_live_proxy.py
index 8b4d001b..6c48c5de 100644
--- a/tests/test_live_proxy.py
+++ b/tests/test_live_proxy.py
@@ -116,7 +116,7 @@ class TestProxyLiveRewriter:
 
         # equal to returned response (echo)
         assert self.requestlog[0] == resp.text
-        assert resp.headers['x-proxy'] == 'test'
+        assert resp.headers['x-archive-orig-x-proxy'] == 'test'
 
         assert resp.text.startswith('GET http://example.com/ HTTP/1.1')
         assert 'referer: http://other.example.com' in resp.text.lower()
@@ -136,7 +136,7 @@ class TestProxyLiveRewriter:
 
         # proxied, but without range
         assert self.requestlog[0] == resp.text
-        assert resp.headers['x-proxy'] == 'test'
+        assert resp.headers['x-archive-orig-x-proxy'] == 'test'
 
         assert self.requestlog[0].startswith('GET http://example.com/ HTTP/1.1')
         assert 'range: ' not in self.requestlog[0]
@@ -182,7 +182,7 @@ class TestProxyLiveRewriter:
         assert resp.headers['Accept-Ranges'] == 'bytes'
 
         # not from proxy
-        assert 'x-proxy' not in resp.headers
+        assert 'x-archive-orig-x-proxy' not in resp.headers
 
         # already pinged proxy, no additional requests set to proxy
         assert len(self.requestlog) == 0