--- a/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
+++ b/netwerk/streamconv/converters/nsHTTPCompressConv.cpp
@@ -35,18 +35,17 @@ nsHTTPCompressConv::nsHTTPCompressConv()
     , mStreamInitialized(false)
     , mLen(0)
     , hMode(0)
     , mSkipCount(0)
     , mFlags(0)
 {
     if (NS_IsMainThread()) {
         mFailUncleanStops =
-            (Preferences::GetBool("network.http.enforce-framing.soft", false) ||
-             Preferences::GetBool("network.http.enforce-framing.http", false));
+            Preferences::GetBool("network.http.enforce-framing.http", false);
     } else {
         mFailUncleanStops = false;
     }
 }
 
 nsHTTPCompressConv::~nsHTTPCompressConv()
 {
     NS_IF_RELEASE(mListener);

--- a/netwerk/test/unit/test_content_length_underrun.js
+++ b/netwerk/test/unit/test_content_length_underrun.js
@@ -213,16 +213,18 @@ function handler4(metadata, response)
   response.write("\r\n");
   response.write(body);
   response.finish();
 }
 
 function completeTest4(request, data, ctx)
 {
   do_check_eq(request.status, Components.results.NS_OK);
+
+  prefs.setBoolPref("network.http.enforce-framing.http1", true);
   run_gzip_test(99);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Test 99: FAIL because a cut off gzip stream CAN be detected
 
 // Note that test 99 here is run completely different than the other tests in
 // this file so if you add more tests here, consider adding them before this.