diff --git a/src/node/utils/tar.json b/src/node/utils/tar.json
index 7d10ab042..7ea9d5f12 100644
--- a/src/node/utils/tar.json
+++ b/src/node/utils/tar.json
@@ -27,7 +27,6 @@
 , "timeslider.js": [
     "timeslider.js"
   , "colorutils.js"
-  , "draggable.js"
   , "pad_utils.js"
   , "$js-cookie/src/js.cookie.js"
   , "browser.js"
@@ -50,42 +49,16 @@
   , "broadcast_slider.js"
   , "broadcast_revisions.js"
   , "socketio.js"
-  ]
-, "ace2_inner.js": [
-    "ace2_inner.js"
-  , "browser.js"
-  , "AttributePool.js"
-  , "Changeset.js"
-  , "ChangesetUtils.js"
-  , "skiplist.js"
-  , "cssmanager.js"
-  , "colorutils.js"
-  , "undomodule.js"
-  , "$unorm/lib/unorm.js"
-  , "contentcollector.js"
-  , "changesettracker.js"
-  , "linestylefilter.js"
-  , "domline.js"
-  , "AttributeManager.js"
-  , "scroll.js"
-  , "caretPosition.js"
-  , "pad_utils.js"
-  , "$js-cookie/src/js.cookie.js"
-  ]
-, "ace2_common.js": [
-    "ace2_common.js"
-  , "browser.js"
-  , "jquery.js"
   , "rjquery.js"
-  , "$async.js"
-  , "underscore.js"
-  , "$underscore.js"
-  , "$underscore/underscore.js"
-  , "security.js"
-  , "$security.js"
+  , "jquery.js"
   , "pluginfw/client_plugins.js"
-  , "pluginfw/plugin_defs.js"
   , "pluginfw/shared.js"
+  , "pluginfw/plugin_defs.js"
   , "pluginfw/hooks.js"
+  , "$security.js"
+  , "security.js"
+  , "ace2_common.js"
+  , "underscore.js"
+  , "$underscore/underscore.js"
   ]
 }
diff --git a/src/templates/timeslider.html b/src/templates/timeslider.html
index 19b99f2f3..ee9d03632 100644
--- a/src/templates/timeslider.html
+++ b/src/templates/timeslider.html
@@ -264,16 +264,18 @@
     // Strip 'p', the padname and 'timeslider' from the pathname and set as baseURL
     var baseURL = pathComponents.slice(0,pathComponents.length-3).join('/') + '/';
 
-
     require.setRootURI(baseURL + "javascripts/src");
     require.setLibraryURI(baseURL + "javascripts/lib");
     require.setGlobalKeyPath("require");
 
+    // this is intentionally moved here so that timeslider, which is a package that contains
+    // most of the code needed for timeslider functionality, is loaded first.
+    var socket = require('ep_etherpad-lite/static/js/timeslider').socket;
+
     $ = jQuery = require('ep_etherpad-lite/static/js/rjquery').jQuery; // Expose jQuery #HACK
     browser = require('ep_etherpad-lite/static/js/browser');
 
     var plugins = require('ep_etherpad-lite/static/js/pluginfw/client_plugins');
-    var socket = require('ep_etherpad-lite/static/js/timeslider').socket;
     BroadcastSlider = require('ep_etherpad-lite/static/js/timeslider').BroadcastSlider;
     plugins.baseURL = baseURL;