diff -u -r content-orig/browser/browser.xul content/browser/browser.xul
--- content-orig/browser/browser.xul	2010-01-25 09:52:26.000000000 -0800
+++ content/browser/browser.xul	2010-01-25 10:01:07.000000000 -0800
@@ -253,12 +253,6 @@
 
     <key id="key_stop" keycode="VK_ESCAPE" oncommand="BrowserStop();"/>
     
-
-    <key id="key_gotoHistory"
-         key="&historySidebarCmd.commandKey;"
-         modifiers="accel"
-         command="viewHistorySidebar"/>
-
     <key id="key_fullZoomReduce"  key="&fullZoomReduceCmd.commandkey;"   command="cmd_fullZoomReduce"  modifiers="accel"/>
     <key                          key="&fullZoomReduceCmd.commandkey2;"  command="cmd_fullZoomReduce"  modifiers="accel"/>
     <key id="key_fullZoomEnlarge" key="&fullZoomEnlargeCmd.commandkey;"  command="cmd_fullZoomEnlarge" modifiers="accel"/>
diff -u -r content-orig/browser/urlbarBindings.xml content/browser/urlbarBindings.xml
--- content-orig/browser/urlbarBindings.xml	2010-01-25 10:04:58.000000000 -0800
+++ content/browser/urlbarBindings.xml	2010-01-25 10:18:53.000000000 -0800
@@ -83,7 +83,8 @@
             return;
           }
 
-          if (aTriggeringEvent && aTriggeringEvent.altKey) {
+          if (aTriggeringEvent &&
+              (aTriggeringEvent.altKey || aTriggeringEvent.ctrlKey)) {
             this.handleRevert();
             content.focus();
             gBrowser.loadOneTab(url, null, null, postData, false,
@@ -105,62 +106,6 @@
           if (!url)
             return ["", null];
 
-          // Only add the suffix when the URL bar value isn't already "URL-like",
-          // and only if we get a keyboard event, to match user expectations.
-          if (!/^\s*(www|https?)\b|\/\s*$/i.test(url) &&
-              (aTriggeringEvent instanceof KeyEvent)) {
-            let accel = aTriggeringEvent.ctrlKey;
-            let shift = aTriggeringEvent.shiftKey;
-
-            let suffix = "";
-
-            switch (true) {
-              case (accel && shift):
-                suffix = ".org/";
-                break;
-              case (shift):
-                suffix = ".net/";
-                break;
-              case (accel):
-                try {
-                  suffix = gPrefService.getCharPref("browser.fixup.alternate.suffix");
-                  if (suffix.charAt(suffix.length - 1) != "/")
-                    suffix += "/";
-                } catch(e) {
-                  suffix = ".com/";
-                }
-                break;
-            }
-
-            if (suffix) {
-              // trim leading/trailing spaces (bug 233205)
-              url = url.trim();
-
-              // Tack www. and suffix on.  If user has appended directories, insert
-              // suffix before them (bug 279035).  Be careful not to get two slashes.
-              // Also, don't add the suffix if it's in the original url (bug 233853).
-      
-              let firstSlash = url.indexOf("/");
-              let existingSuffix = url.indexOf(suffix.substring(0, suffix.length - 1));
-
-              // * Logic for slash and existing suffix (example)
-              // No slash, no suffix: Add suffix (mozilla)
-              // No slash, yes suffix: Add slash (mozilla.com)
-              // Yes slash, no suffix: Insert suffix (mozilla/stuff)
-              // Yes slash, suffix before slash: Do nothing (mozilla.com/stuff)
-              // Yes slash, suffix after slash: Insert suffix (mozilla/?stuff=.com)
-      
-              if (firstSlash >= 0) {
-                if (existingSuffix == -1 || existingSuffix > firstSlash)
-                  url = url.substring(0, firstSlash) + suffix +
-                        url.substring(firstSlash + 1);
-              } else
-                url = url + (existingSuffix == -1 ? suffix : "/");
-
-              url = "http://www." + url;
-            }
-          }
-
           var postData = {};
           url = getShortcutOrURI(url, postData);