diff --git a/admin/spark-standalone.sh b/admin/spark-standalone.sh
index 1c68f3116b..2b38d4a5a3 100755
--- a/admin/spark-standalone.sh
+++ b/admin/spark-standalone.sh
@@ -8,7 +8,6 @@ PACKAGES_DIR=`dirname $0`/../packages
 
 echo 'Meteor = {};'
 cat $PACKAGES_DIR/uuid/uuid.js
-cat $PACKAGES_DIR/meteor/dynamics_browser.js
 cat $PACKAGES_DIR/deps/deps.js
 cat $PACKAGES_DIR/liverange/liverange.js
 cat $PACKAGES_DIR/universal-events/listener.js
diff --git a/packages/spark/spark.js b/packages/spark/spark.js
index 304800ffc3..8d9a6efc33 100644
--- a/packages/spark/spark.js
+++ b/packages/spark/spark.js
@@ -29,7 +29,20 @@
 
 Spark = {};
 
-Spark._currentRenderer = new Meteor.EnvironmentVariable;
+Spark._currentRenderer = (function () {
+  var current = null;
+  return {
+    get: function () {
+      return current;
+    },
+    withValue: function (v, func) {
+      var previous = current;
+      current = v;
+      try { return func(); }
+      finally { current = previous; }
+    }
+  };
+})();
 
 Spark._TAG = "_spark_" + Meteor.uuid();
 // XXX document contract for each type of annotation?