diff --git a/mozilla/docshell/base/nsDocShell.cpp b/mozilla/docshell/base/nsDocShell.cpp
index 554492fbba3..35bc3a11470 100644
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -6370,7 +6370,9 @@ nsDocShell::InternalLoad(nsIURI * aURI,
     //
     {
         PRBool inherits;
-        if (!owner && (aFlags & INTERNAL_LOAD_FLAGS_INHERIT_OWNER) &&
+        // One more twist: Don't inherit the owner for external loads.
+        if (aLoadType != LOAD_NORMAL_EXTERNAL && !owner &&
+            (aFlags & INTERNAL_LOAD_FLAGS_INHERIT_OWNER) &&
             NS_SUCCEEDED(URIInheritsSecurityContext(aURI, &inherits)) &&
             inherits) {
             owner = GetInheritedPrincipal(PR_TRUE);