--- a/devtools/client/debugger/debugger.xul
+++ b/devtools/client/debugger/debugger.xul
@@ -184,42 +184,26 @@
          command="nextSourceCommand"/>
     <key id="prevSourceKey"
          keycode="VK_UP"
          modifiers="accel alt"
          command="prevSourceCommand"/>
     <key id="resumeKey"
          keycode="&debuggerUI.stepping.resume1;"
          command="resumeCommand"/>
-    <key id="resumeKey2"
-         keycode="&debuggerUI.stepping.resume2;"
-         modifiers="accel"
-         command="resumeCommand"/>
     <key id="stepOverKey"
          keycode="&debuggerUI.stepping.stepOver1;"
          command="stepOverCommand"/>
-    <key id="stepOverKey2"
-         keycode="&debuggerUI.stepping.stepOver2;"
-         modifiers="accel"
-         command="stepOverCommand"/>
     <key id="stepInKey"
          keycode="&debuggerUI.stepping.stepIn1;"
          command="stepInCommand"/>
-    <key id="stepInKey2"
-         keycode="&debuggerUI.stepping.stepIn2;"
-         modifiers="accel"
-         command="stepInCommand"/>
     <key id="stepOutKey"
          keycode="&debuggerUI.stepping.stepOut1;"
          modifiers="shift"
          command="stepOutCommand"/>
-    <key id="stepOutKey2"
-         keycode="&debuggerUI.stepping.stepOut2;"
-         modifiers="accel shift"
-         command="stepOutCommand"/>
     <key id="fileSearchKey"
          key="&debuggerUI.searchFile.key;"
          modifiers="accel"
          command="fileSearchCommand"/>
     <key id="fileSearchKey"
          key="&debuggerUI.searchFile.altkey;"
          modifiers="accel"
          command="fileSearchCommand"/>

--- a/devtools/client/debugger/panel.js
+++ b/devtools/client/debugger/panel.js
@@ -49,19 +49,17 @@ DebuggerPanel.prototype = {
 
     return targetPromise
       .then(() => this._controller.startupDebugger())
       .then(() => this._controller.connect())
       .then(() => {
         this._toolbox.on("host-changed", this.handleHostChanged);
         // Add keys from this document's keyset to the toolbox, so they
         // can work when the split console is focused.
-        let keysToClone = ["resumeKey", "resumeKey2", "stepOverKey",
-                          "stepOverKey2", "stepInKey", "stepInKey2",
-                          "stepOutKey", "stepOutKey2"];
+        let keysToClone = ["resumeKey", "stepOverKey", "stepInKey", "stepOutKey"];
         for (let key of keysToClone) {
           let elm = this.panelWin.document.getElementById(key);
           this._toolbox.useKeyWithSplitConsole(elm, "jsdebugger");
         }
         this.isReady = true;
         this.emit("ready");
         return this;
       })

--- a/devtools/client/locales/en-US/debugger.dtd
+++ b/devtools/client/locales/en-US/debugger.dtd
@@ -192,23 +192,19 @@
 <!ENTITY debuggerUI.removeAllWatch           "Remove All Watch Expressions">
 <!ENTITY debuggerUI.removeAllWatch.key       "E">
 <!ENTITY debuggerUI.removeAllWatch.accesskey "E">
 
 <!-- LOCALIZATION NOTE (debuggerUI.stepping): These are the keycodes that
   -  control the stepping commands in the debugger (continue, step over,
   -  step in and step out). -->
 <!ENTITY debuggerUI.stepping.resume1    "VK_F8">
-<!ENTITY debuggerUI.stepping.resume2    "VK_SLASH">
 <!ENTITY debuggerUI.stepping.stepOver1  "VK_F10">
-<!ENTITY debuggerUI.stepping.stepOver2  "VK_QUOTE">
 <!ENTITY debuggerUI.stepping.stepIn1    "VK_F11">
-<!ENTITY debuggerUI.stepping.stepIn2    "VK_SEMICOLON">
 <!ENTITY debuggerUI.stepping.stepOut1   "VK_F11">
-<!ENTITY debuggerUI.stepping.stepOut2   "VK_SEMICOLON">
 
 <!-- LOCALIZATION NOTE (debuggerUI.context.newTab):  This is the label
   -  for the Open in New Tab menu item displayed in the context menu of the
   -  debugger sources side menu. This should be the same as
   -  netmonitorUI.context.newTab  -->
 <!ENTITY debuggerUI.context.newTab           "Open in New Tab">
 <!ENTITY debuggerUI.context.newTab.accesskey "O">