diff --git a/mozilla/docshell/base/nsWebShell.cpp b/mozilla/docshell/base/nsWebShell.cpp
index 8db23e0b803..badcdce00f2 100644
--- a/mozilla/docshell/base/nsWebShell.cpp
+++ b/mozilla/docshell/base/nsWebShell.cpp
@@ -2202,6 +2202,7 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec,
     convertFileToURL(urlStr, urlSpec);
     rv = NS_NewURI(getter_AddRefs(uri), urlSpec, nsnull);
     if (NS_FAILED(rv)) {
+#if 0
       // keyword failover
       // we kick the following cases to the keyword server:
       //   * starts with a '?'
@@ -2215,6 +2216,7 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec,
 
           rv = NS_NewURI(getter_AddRefs(uri), keywordSpec, nsnull);
       }
+#endif // 0
 
       if (NS_FAILED(rv)) {
           PRInt32 colon, fSlash = urlSpec.FindChar('/');
diff --git a/mozilla/webshell/src/nsWebShell.cpp b/mozilla/webshell/src/nsWebShell.cpp
index 8db23e0b803..badcdce00f2 100644
--- a/mozilla/webshell/src/nsWebShell.cpp
+++ b/mozilla/webshell/src/nsWebShell.cpp
@@ -2202,6 +2202,7 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec,
     convertFileToURL(urlStr, urlSpec);
     rv = NS_NewURI(getter_AddRefs(uri), urlSpec, nsnull);
     if (NS_FAILED(rv)) {
+#if 0
       // keyword failover
       // we kick the following cases to the keyword server:
       //   * starts with a '?'
@@ -2215,6 +2216,7 @@ nsWebShell::LoadURL(const PRUnichar *aURLSpec,
 
           rv = NS_NewURI(getter_AddRefs(uri), keywordSpec, nsnull);
       }
+#endif // 0
 
       if (NS_FAILED(rv)) {
           PRInt32 colon, fSlash = urlSpec.FindChar('/');