diff --git a/lib/gcli/types/node.js b/lib/gcli/types/node.js
index <HASH>..<HASH> 100644
--- a/lib/gcli/types/node.js
+++ b/lib/gcli/types/node.js
@@ -56,7 +56,9 @@ exports.getWindowHolder = function() {
  * NodeListType to allow terminal to tell us which nodes should be highlighted
  */
 function onEnter(assignment) {
-  assignment.highlighter = new Highlighter(windowHolder.window.document);
+  // TODO: GCLI doesn't support passing a context to notifications of cursor
+  // position, so onEnter/onLeave/onChange are disabled below until we fix this
+  assignment.highlighter = new Highlighter(context.environment.window.document);
   assignment.highlighter.nodelist = assignment.conversion.matches;
 }
 
@@ -141,9 +143,9 @@ exports.items = [
       return Promise.resolve(reply);
     },
 
-    onEnter: onEnter,
-    onLeave: onLeave,
-    onChange: onChange
+    // onEnter: onEnter,
+    // onLeave: onLeave,
+    // onChange: onChange
   },
   {
     // The 'nodelist' type is a CSS expression that refers to a node list
@@ -217,8 +219,8 @@ exports.items = [
       return Promise.resolve(reply);
     },
 
-    onEnter: onEnter,
-    onLeave: onLeave,
-    onChange: onChange
+    // onEnter: onEnter,
+    // onLeave: onLeave,
+    // onChange: onChange
   }
 ];
runat-<I>: Remove onEnter/onLeave/onChange notification

The idea was that we could highlight nodes when command line cursor was
'inside' the relevant argument. But it's not working for several
reasons:
* It needs remoting (and this could be a perf issue)
* We've not hooked it up to the new multiple node highlighter
* The requirement to have context.environment.window hooked up is making
  things worse

So I'm disabling it here.