diff --git a/devtools/client/definitions.js b/devtools/client/definitions.js
index 0058a9e41c00..dfe493ce22be 100644
--- a/devtools/client/definitions.js
+++ b/devtools/client/definitions.js
@@ -285,9 +285,14 @@ Tools.memory = {
   label: "Memory",
   panelLabel: "Memory Panel",
   tooltip: "Memory (keyboardshortcut)",
+  hiddenInOptions: true,
 
   isTargetSupported: function (target) {
-    return target.getTrait("heapSnapshots");
+    // TODO 1201907
+    // Once Fx44 lands, we should add a root trait `heapSnapshots`
+    // to indicate that the memory actor can handle this.
+    // Shouldn't make this change until Fx44, however.
+    return true; // target.getTrait("heapSnapshots");
   },
 
   build: function (frame, target) {
diff --git a/devtools/client/memory/components/toolbar.js b/devtools/client/memory/components/toolbar.js
index 145899684f51..ca3d847e3378 100644
--- a/devtools/client/memory/components/toolbar.js
+++ b/devtools/client/memory/components/toolbar.js
@@ -36,12 +36,12 @@ const Toolbar = module.exports = createClass({
       dom.div({ className: "devtools-toolbar" },
         dom.button({ className: `take-snapshot devtools-button`, onClick: onTakeSnapshotClick }),
 
-        dom.label({},
+        DOM.label({},
           "Breakdown by ",
-          dom.select({
+          DOM.select({
             className: `select-breakdown`,
             onChange: e => onBreakdownChange(e.target.value),
-          }, ...breakdowns.map(({ name, displayName }) => dom.option({ key: name, value: name }, displayName)))
+          }, ...breakdowns.map(({ name, displayName }) => DOM.option({ key: name, value: name }, displayName)))
         ),
 
         dom.label({},
diff --git a/devtools/server/actors/root.js b/devtools/server/actors/root.js
index eb8d6465436d..501a8520a01c 100644
--- a/devtools/server/actors/root.js
+++ b/devtools/server/actors/root.js
@@ -173,9 +173,6 @@ RootActor.prototype = {
     // Whether or not `getProfile()` supports specifying a `startTime`
     // and `endTime` to filter out samples. Fx40+
     profilerDataFilterable: true,
-    // Whether or not the MemoryActor's heap snapshot abilities are
-    // fully equipped to handle heap snapshots for the memory tool. Fx44+
-    heapSnapshots: true,
   },
 
   /**