diff --git a/mozilla/uriloader/base/nsIURILoader.idl b/mozilla/uriloader/base/nsIURILoader.idl
index 7ba1ae05f24..7a77fe69553 100644
--- a/mozilla/uriloader/base/nsIURILoader.idl
+++ b/mozilla/uriloader/base/nsIURILoader.idl
@@ -107,9 +107,8 @@ interface nsIURILoader : nsISupports
 
     /* these are nsURILoadCommand */
    const long viewNormal = 0;
-   const long viewUserClick = 1;
-   const long viewNewWindow = 2;
-   const long viewNormalBackground = 3;
+   const long viewUserClick = 7;
+   const long viewNormalBackground = 0;
 
   /* mscott -> I'm going to move this out into a separate private interface
    */
diff --git a/mozilla/uriloader/base/nsURILoader.cpp b/mozilla/uriloader/base/nsURILoader.cpp
index de372433a40..83774108ce5 100644
--- a/mozilla/uriloader/base/nsURILoader.cpp
+++ b/mozilla/uriloader/base/nsURILoader.cpp
@@ -549,18 +549,6 @@ NS_IMETHODIMP nsURILoader::GetTarget(nsIChannel * aChannel, const char * aWindow
   else
   {
     windowCtxtAsTreeItem->FindItemWithName(name.GetUnicode(), nsnull, getter_AddRefs(treeItem));
-    // this is a bit hokey.....if we retargted this content to a different window
-    // during GetTarget, then tweak the load attributes on the channel to set the
-    // LOAD_RETARGETED_DOCUMENT_URI flag...
-    nsCOMPtr<nsISupports> retargetedWindowCtxt = do_QueryInterface(treeItem);
-    if (retargetedWindowCtxt && (aWindowContext != retargetedWindowCtxt.get()))
-    {
-       // we must be retargeting...so set an appropriate flag on the channel
-      nsLoadFlags loadAttribs = 0;
-      aChannel->GetLoadAttributes(&loadAttribs);
-      loadAttribs |= nsIChannel::LOAD_RETARGETED_DOCUMENT_URI;
-      aChannel->SetLoadAttributes(loadAttribs);
-    }
   }
 
   nsCOMPtr<nsISupports> treeItemCtxt (do_QueryInterface(treeItem));