diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js
index 5c71cb1d..c48be1bc 100644
--- a/src/static/js/ace2_inner.js
+++ b/src/static/js/ace2_inner.js
@@ -1086,7 +1086,7 @@ function Ace2Inner(){
     {
       if (scheduledTimeout)
       {
-        clearTimeout(scheduledTimeout);
+        scheduler.clearTimeout(scheduledTimeout);
         scheduledTimeout = null;
       }
     }
diff --git a/src/static/js/changesettracker.js b/src/static/js/changesettracker.js
index 16a23cdb..58ef21cb 100644
--- a/src/static/js/changesettracker.js
+++ b/src/static/js/changesettracker.js
@@ -51,7 +51,7 @@ function makeChangesetTracker(scheduler, apool, aceCallbacksProvider)
     // and if there isn't a timeout already scheduled.
     if (changeCallback && changeCallbackTimeout === null)
     {
-      changeCallbackTimeout = setTimeout(function()
+      changeCallbackTimeout = scheduler.setTimeout(function()
       {
         try
         {