diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index d4c3c4980c..7e1ed496c9 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -205,7 +205,7 @@ return array(
     'rsrc/externals/javelin/lib/JSON.js' => '69adf288',
     'rsrc/externals/javelin/lib/Leader.js' => '331b1611',
     'rsrc/externals/javelin/lib/Mask.js' => '8a41885b',
-    'rsrc/externals/javelin/lib/Quicksand.js' => '51aeb01d',
+    'rsrc/externals/javelin/lib/Quicksand.js' => '7ba665f5',
     'rsrc/externals/javelin/lib/Request.js' => '94b750d2',
     'rsrc/externals/javelin/lib/Resource.js' => '44959b73',
     'rsrc/externals/javelin/lib/Routable.js' => 'b3e7d692',
@@ -675,7 +675,7 @@ return array(
     'javelin-leader' => '331b1611',
     'javelin-magical-init' => '3010e992',
     'javelin-mask' => '8a41885b',
-    'javelin-quicksand' => '51aeb01d',
+    'javelin-quicksand' => '7ba665f5',
     'javelin-reactor' => '2b8de964',
     'javelin-reactor-dom' => 'c90a04fc',
     'javelin-reactor-node-calmer' => '76f4ebed',
@@ -1190,9 +1190,6 @@ return array(
       'javelin-dom',
       'javelin-reactor-dom',
     ),
-    '51aeb01d' => array(
-      'javelin-install',
-    ),
     '54b612ba' => array(
       'javelin-color',
       'javelin-install',
@@ -1416,6 +1413,9 @@ return array(
       'javelin-stratcom',
       'javelin-util',
     ),
+    '7ba665f5' => array(
+      'javelin-install',
+    ),
     '7cbe244b' => array(
       'javelin-install',
       'javelin-util',
diff --git a/webroot/rsrc/externals/javelin/lib/Quicksand.js b/webroot/rsrc/externals/javelin/lib/Quicksand.js
index 0d6be34487..780e03131d 100644
--- a/webroot/rsrc/externals/javelin/lib/Quicksand.js
+++ b/webroot/rsrc/externals/javelin/lib/Quicksand.js
@@ -51,6 +51,7 @@ JX.install('Quicksand', {
 
       self._started = true;
       var path = self._getRelativeURI(window.location);
+      self._id = window.history.state || 0;
       var id = self._id;
       self._history.push({path: path, id: id});
 
@@ -155,7 +156,7 @@ JX.install('Quicksand', {
       var id = ++self._id;
 
       self._history.push({path: path, id: id});
-      JX.History.push(path, {quicksand: id});
+      JX.History.push(path, id);
 
       self._cursor = (self._history.length - 1);
       self._responses[id] = null;
@@ -262,7 +263,7 @@ JX.install('Quicksand', {
       var self = JX.Quicksand;
 
       var data = e.getData();
-      data.state = (data.state && data.state.quicksand) || null;
+      data.state = data.state || null;
 
       // Check if we're going back to the first page we started Quicksand on.
       // We don't have a state value, but can look at the path.