diff --git a/browser/branding/r3dfox/LICENSE b/browser/branding/r3dfox/LICENSE
index 9593f9c7b61f9..1c994b15f4f4d 100644
--- a/browser/branding/r3dfox/LICENSE
+++ b/browser/branding/r3dfox/LICENSE
@@ -1,7 +1,7 @@
 These files are under the MPL 2, as below. However, please note that you 
 are not granted any trademark rights or licenses to the trademarks of the
-Mozilla Foundation or any party, including without limitation the
-Firefox name or logo.
+Eclipse Community or any party, including without limitation the
+r3dfox name or logo.
 
 For more information, see: https://www.mozilla.org/foundation/licensing/
 
diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp
index 04a2bed1fbd49..10bbbc08ca3e7 100644
--- a/netwerk/protocol/http/nsHttpHandler.cpp
+++ b/netwerk/protocol/http/nsHttpHandler.cpp
@@ -789,11 +789,11 @@ void nsHttpHandler::BuildUserAgent() {
   mUserAgent += mProductSub;
 
   bool isFirefox = mAppName.EqualsLiteral("Firefox");
-  if (isFirefox || mCompatFirefoxEnabled) {
+  
     // "Firefox/x.y" (compatibility) app token
     mUserAgent += ' ';
     mUserAgent += mCompatFirefox;
-  }
+
   if (!isFirefox) {
     // App portion
     mUserAgent += ' ';