diff --git a/tools/deploy-galaxy.js b/tools/deploy-galaxy.js
index 39dbb72193..8a77812e6b 100644
--- a/tools/deploy-galaxy.js
+++ b/tools/deploy-galaxy.js
@@ -67,6 +67,10 @@ exports.deleteApp = function (app) {
 // - appDir
 // - settings
 // - bundleOptions
+// - starball
+// XXX refactor this to separate the "maybe bundle" part from "actually deploy"
+//     so we can be careful to not rely on any of the app dir context when
+//     in --star mode.
 exports.deploy = function (options) {
   var galaxy = getGalaxy(options.context);
   var Meteor = getMeteor(options.context);
diff --git a/tools/meteor.js b/tools/meteor.js
index 149195e20e..34497d1314 100644
--- a/tools/meteor.js
+++ b/tools/meteor.js
@@ -785,7 +785,9 @@ Fiber(function () {
           deploy.delete_app(site);
       } else {
         var starball = new_argv.star;
-        requireDirInApp("deploy");
+        // We don't need to be in an app if we're not going to run the bundler.
+        if (!starball)
+          requireDirInApp("deploy");
         var settings = undefined;
         if (new_argv.settings)
           settings = runner.getSettings(new_argv.settings);