diff --git a/setupbase.py b/setupbase.py
index 5c837acb12..13973b013d 100755
--- a/setupbase.py
+++ b/setupbase.py
@@ -128,6 +128,7 @@ def find_package_data():
     ])
 
     components = pjoin("static", "components")
+    node_modules = pjoin(repo_root, "node_modules")
     # select the components we actually need to install
     # (there are lots of resources we bundle for sdist-reasons that we don't actually use)
     static_data.extend([
@@ -135,7 +136,7 @@ def find_package_data():
         pjoin(components, "bootstrap", "js", "bootstrap.min.js"),
         pjoin(components, "bootstrap-tour", "build", "css", "bootstrap-tour.min.css"),
         pjoin(components, "bootstrap-tour", "build", "js", "bootstrap-tour.min.js"),
-        pjoin(components, "es6-promise", "*.js"),
+        pjoin(node_modules, "es6-promise", "dist", "es6-promise.min.js"),
         pjoin(components, "font-awesome", "css", "*.css"),
         pjoin(components, "font-awesome", "fonts", "*.*"),
         pjoin(components, "google-caja", "html-css-sanitizer-minified.js"),
@@ -146,11 +147,11 @@ def find_package_data():
         pjoin(components, "jquery-ui", "themes", "smoothness", "jquery-ui.min.css"),
         pjoin(components, "jquery-ui", "themes", "smoothness", "images", "*"),
         pjoin(components, "marked", "lib", "marked.js"),
+        # pjoin(node_modules, "moment", "moment.js"),
+        pjoin(node_modules, "moment", "min", "moment.min.js"),
         pjoin(components, "requirejs", "require.js"),
-        pjoin(components, "underscore", "underscore-min.js"),
-        pjoin(components, "moment", "moment.js"),
-        pjoin(components, "moment", "min", "moment.min.js"),
         pjoin(components, "text-encoding", "lib", "encoding.js"),
+        pjoin(node_modules, "underscore", "underscore-min.js"),
     ])
 
     # Ship all of Codemirror's CSS and JS