diff --git a/static/js/pad2.js b/static/js/pad2.js
index 52247dd26..15545541a 100644
--- a/static/js/pad2.js
+++ b/static/js/pad2.js
@@ -438,7 +438,7 @@ var pad = {
     }
 
     // order of inits is important here:
-    padcookie.init(clientVars.cookiePrefsToSet);
+    padcookie.init(clientVars.cookiePrefsToSet, this);
   
     $("#widthprefcheck").click(pad.toggleWidthPref);
     // $("#sidebarcheck").click(pad.togglewSidebar);
@@ -465,16 +465,16 @@ var pad = {
       initialTitle: clientVars.initialTitle,
       initialPassword: clientVars.initialPassword,
       guestPolicy: pad.padOptions.guestPolicy
-    });
-    padimpexp.init();
-    padsavedrevs.init(clientVars.initialRevisionList);
+    }, this);
+    padimpexp.init(this);
+    padsavedrevs.init(clientVars.initialRevisionList, this);
 
-    padeditor.init(postAceInit, pad.padOptions.view || {});
+    padeditor.init(postAceInit, pad.padOptions.view || {}, this);
 
-    paduserlist.init(pad.myUserInfo);
+    paduserlist.init(pad.myUserInfo, this);
     //    padchat.init(clientVars.chatHistory, pad.myUserInfo);
     padconnectionstatus.init();
-    padmodals.init();
+    padmodals.init(this);
 
     pad.collabClient = getCollabClient(padeditor.ace, clientVars.collab_client_vars, pad.myUserInfo, {
       colorPalette: pad.getColorPalette()
diff --git a/static/js/pad_cookie.js b/static/js/pad_cookie.js
index 24dc1e3fa..1bb5700ad 100644
--- a/static/js/pad_cookie.js
+++ b/static/js/pad_cookie.js
@@ -87,9 +87,9 @@ var padcookie = (function()
 
   var pad = undefined;
   var self = {
-    init: function(prefsToSet)
+    init: function(prefsToSet, _pad)
     {
-      pad = require('/pad2').pad; // Sidestep circular dependency (should be injected).
+      pad = _pad;
 
       var rawCookie = getRawCookie();
       if (rawCookie)
diff --git a/static/js/pad_docbar.js b/static/js/pad_docbar.js
index cf461c93d..b83bf3bfe 100644
--- a/static/js/pad_docbar.js
+++ b/static/js/pad_docbar.js
@@ -118,9 +118,9 @@ var paddocbar = (function()
   var self = {
     title: null,
     password: null,
-    init: function(opts)
+    init: function(opts, _pad)
     {
-      pad = require('/pad2').pad; // Sidestep circular dependency (should be injected).
+      pad = _pad;
 
       panels = {
         impexp: {
diff --git a/static/js/pad_editor.js b/static/js/pad_editor.js
index e7be81753..6d3cbf409 100644
--- a/static/js/pad_editor.js
+++ b/static/js/pad_editor.js
@@ -32,11 +32,11 @@ var padeditor = (function()
     ace: null,
     // this is accessed directly from other files
     viewZoom: 100,
-    init: function(readyFunc, initialViewOptions)
+    init: function(readyFunc, initialViewOptions, _pad)
     {
       Ace2Editor = require('/ace').Ace2Editor;
-      pad = require('/pad2').pad; // Sidestep circular dependency (should be injected).
-      settings = require('/pad2').settings;
+      pad = _pad;
+      settings = pad.settings;
 
       function aceReady()
       {
diff --git a/static/js/pad_impexp.js b/static/js/pad_impexp.js
index aa99541ea..0037195f2 100644
--- a/static/js/pad_impexp.js
+++ b/static/js/pad_impexp.js
@@ -236,13 +236,9 @@ var padimpexp = (function()
   /////
   var pad = undefined;
   var self = {
-    init: function()
+    init: function(_pad)
     {
-      try {
-      pad = require('/pad2').pad; // Sidestep circular dependency (should be injected).
-      } catch (e) {
-        // skip (doesn't require pad when required by timeslider)
-      }
+      pad = _pad;
 
       //get /p/padname
       var pad_root_path = new RegExp(/.*\/p\/[^\/]+/).exec(document.location.pathname)
diff --git a/static/js/pad_modals.js b/static/js/pad_modals.js
index 81ef0776b..b78e28f40 100644
--- a/static/js/pad_modals.js
+++ b/static/js/pad_modals.js
@@ -75,9 +75,9 @@ var padmodals = (function()
 
   var pad = undefined;
   var self = {
-    init: function()
+    init: function(_pad)
     {
-      pad = require('/pad2').pad; // Sidestep circular dependency (should be injected).
+      pad = _pad;
 
       self.initFeedback();
       self.initShareBox();
diff --git a/static/js/pad_savedrevs.js b/static/js/pad_savedrevs.js
index bb52658b2..6d37dfa81 100644
--- a/static/js/pad_savedrevs.js
+++ b/static/js/pad_savedrevs.js
@@ -349,9 +349,9 @@ var padsavedrevs = (function()
 
   var pad = undefined;
   var self = {
-    init: function(initialRevisions)
+    init: function(initialRevisions, _pad)
     {
-      pad = require('/pad2').pad; // Sidestep circular dependency (should be injected).
+      pad = _pad;
       self.newRevisionList(initialRevisions, true);
 
       $("#savedrevs-savenow").click(function()
diff --git a/static/js/pad_userlist.js b/static/js/pad_userlist.js
index e0a12f838..2c063d74c 100644
--- a/static/js/pad_userlist.js
+++ b/static/js/pad_userlist.js
@@ -464,9 +464,9 @@ var paduserlist = (function()
 
   var pad = undefined;
   var self = {
-    init: function(myInitialUserInfo)
+    init: function(myInitialUserInfo, _pad)
     {
-      pad = require('/pad2').pad; // Sidestep circular dependency (should be injected).
+      pad = _pad;
 
       self.setMyUserInfo(myInitialUserInfo);