diff --git a/mozilla/suite/common/mac/platformCommunicatorOverlay.xul b/mozilla/suite/common/mac/platformCommunicatorOverlay.xul
index 9ef8762ed66..5be13b1d3f5 100644
--- a/mozilla/suite/common/mac/platformCommunicatorOverlay.xul
+++ b/mozilla/suite/common/mac/platformCommunicatorOverlay.xul
@@ -89,15 +89,8 @@
          key="&minimizeWindowCmd.key;"
          modifiers="accel"/>
 
-  <!-- Standard OS X shortcut for opening Help (Cmd+? on most locales), visible
-    in the Help menu (if there's a Help viewer) -->
     <key id="key_openHelp"
-         key="&openHelpFrontend.key;"
-         modifiers="&openHelpFrontend.modifiers;"/>
-
-  <!-- The Shift key is needed for the "?", thus we need openHelpCmd.key and
-    openHelpCmd.modifiers for the mapping -->
-    <key key="&openHelpCmd.key;"
+         key="&openHelpCmd.key;"
          modifiers="&openHelpCmd.modifiers;"
          command="cmd_openHelp"/>
 
diff --git a/mozilla/suite/locales/en-US/chrome/common/mac/platformCommunicatorOverlay.dtd b/mozilla/suite/locales/en-US/chrome/common/mac/platformCommunicatorOverlay.dtd
index 8146295d89a..35a891b2094 100644
--- a/mozilla/suite/locales/en-US/chrome/common/mac/platformCommunicatorOverlay.dtd
+++ b/mozilla/suite/locales/en-US/chrome/common/mac/platformCommunicatorOverlay.dtd
@@ -41,18 +41,11 @@
 <!ENTITY minimizeWindowCmd.key          "M">
 <!ENTITY zoomWindowCmd.label            "Zoom">
 
-<!-- Help viewer -->
+<!-- Help menu -->
 <!ENTITY openHelpCmd.label              "&brandShortName; Help">
 <!ENTITY openHelpCmd.accesskey          "H">
-
-<!-- LOCALIZATION NOTE: openHelpFrontend.key and openHelpFrontend.modifiers
-  will show the standard OS X shortcut (Cmd+? on most locales) in the Help
-  menu. To make the shortcut work, mapping (Cmd+Shift+/ on en-US) is done with
-  openHelpCmd.key and openHelpCmd.modifiers. -->
-<!ENTITY openHelpFrontend.key            "?">
-<!ENTITY openHelpFrontend.modifiers      "accel">
-<!ENTITY openHelpCmd.key                 "/">
-<!ENTITY openHelpCmd.modifiers           "accel,shift">
+<!ENTITY openHelpCmd.key                "?">
+<!ENTITY openHelpCmd.modifiers          "accel">
 
 <!-- Key labels, for mousewheel prefs -->
 <!ENTITY ctrlKey.label                   "Ctrl">