diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 6fc31758ff72cd8fa67ffb0c2e9eb64bdf92b5e5..c72176d56dd6e94e8644c5181152121fa4e84b6f 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,18 @@
+2011-11-19  Ojan Vafai  <ojan@chromium.org>
+
+        Allow json NRWT downloads to be pure json and not jsonp
+        https://bugs.webkit.org/show_bug.cgi?id=72809
+
+        Reviewed by Adam Barth.
+
+        I'm moving the server to storing and serving up raw json instead of jsonp.
+        You can still get the jsonp by passing a "callback" parameter, but there's no
+        need for run-webkit-tests to get jsonp when all it wants is the raw json.
+
+        * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
+        Make the wrapper stripping only happen if the json is actually wrapped.
+        * Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py:
+
 2011-11-18  Daniel Bates  <dbates@rim.com>
 
         Add CMake build infrastructure for the BlackBerry port
diff --git a/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py b/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py
index 38a123535863d4861ededa86d03c3a8b2d13fb6c..cf58498bd5243193ce7ca25738cee69b321cdfd0 100644
--- a/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py
+++ b/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py
@@ -56,7 +56,9 @@ def has_json_wrapper(string):
 
 
 def strip_json_wrapper(json_content):
-    return json_content[len(_JSON_PREFIX):len(json_content) - len(_JSON_SUFFIX)]
+    if has_json_wrapper(json_content):
+        return json_content[len(_JSON_PREFIX):len(json_content) - len(_JSON_SUFFIX)]
+    return json_content
 
 
 def load_json(filesystem, file_path):
diff --git a/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py b/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py
index 6adbf941442ae0ab5b9485ae266912bf092c010e..0a31e47bba128b8b4f579875b9ca24a59e111bf6 100644
--- a/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py
+++ b/Tools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator_unittest.py
@@ -58,6 +58,11 @@ class JSONGeneratorTest(unittest.TestCase):
         self._FAILS_count = 0
         self._fixable_count = 0
 
+    def test_strip_json_wrapper(self):
+        json = "['contents']"
+        self.assertEqual(json_results_generator.strip_json_wrapper(json_results_generator._JSON_PREFIX + json + json_results_generator._JSON_SUFFIX), json)
+        self.assertEqual(json_results_generator.strip_json_wrapper(json), json)
+
     def _test_json_generation(self, passed_tests_list, failed_tests_list):
         tests_set = set(passed_tests_list) | set(failed_tests_list)