diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index bf2fa84a72..bbd3c5e317 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -10,10 +10,10 @@ return array(
     'conpherence.pkg.css' => 'ff161f2d',
     'conpherence.pkg.js' => 'b5b51108',
     'core.pkg.css' => '5ffe8b79',
-    'core.pkg.js' => '6b2da600',
+    'core.pkg.js' => 'a8eda64a',
     'darkconsole.pkg.js' => '1f9a31bc',
     'differential.pkg.css' => 'bf87589e',
-    'differential.pkg.js' => 'ee4f14c5',
+    'differential.pkg.js' => '24d1acf0',
     'diffusion.pkg.css' => 'b93d9b8c',
     'diffusion.pkg.js' => '84c8f8fd',
     'favicon.ico' => '30672e08',
@@ -393,7 +393,7 @@ return array(
     'rsrc/js/application/diff/DiffChangeset.js' => 'cf4e2140',
     'rsrc/js/application/diff/DiffChangesetList.js' => 'a716ca27',
     'rsrc/js/application/diff/DiffInline.js' => '77e14b60',
-    'rsrc/js/application/diff/ScrollObjective.js' => '0eee7a00',
+    'rsrc/js/application/diff/ScrollObjective.js' => '2e069f79',
     'rsrc/js/application/diff/ScrollObjectiveList.js' => '085dd101',
     'rsrc/js/application/diff/behavior-preview-link.js' => '051c7832',
     'rsrc/js/application/differential/behavior-comment-preview.js' => '51c5ad07',
@@ -480,7 +480,7 @@ return array(
     'rsrc/js/core/ShapedRequest.js' => '7cbe244b',
     'rsrc/js/core/TextAreaUtils.js' => '320810c8',
     'rsrc/js/core/Title.js' => '485aaa6c',
-    'rsrc/js/core/ToolTip.js' => '8fadb715',
+    'rsrc/js/core/ToolTip.js' => '74caa17f',
     'rsrc/js/core/behavior-active-nav.js' => 'e379b58e',
     'rsrc/js/core/behavior-audio-source.js' => '59b251eb',
     'rsrc/js/core/behavior-autofocus.js' => '7319e029',
@@ -799,7 +799,7 @@ return array(
     'phabricator-phtize' => 'd254d646',
     'phabricator-prefab' => 'c5af80a2',
     'phabricator-remarkup-css' => 'd1a5e11e',
-    'phabricator-scroll-objective' => '0eee7a00',
+    'phabricator-scroll-objective' => '2e069f79',
     'phabricator-scroll-objective-list' => '085dd101',
     'phabricator-search-results-css' => 'f87d23ad',
     'phabricator-shaped-request' => '7cbe244b',
@@ -808,7 +808,7 @@ return array(
     'phabricator-standard-page-view' => 'eb5b80c5',
     'phabricator-textareautils' => '320810c8',
     'phabricator-title' => '485aaa6c',
-    'phabricator-tooltip' => '8fadb715',
+    'phabricator-tooltip' => '74caa17f',
     'phabricator-ui-example-css' => '528b19de',
     'phabricator-uiexample-javelin-view' => 'd4a14807',
     'phabricator-uiexample-reactor-button' => 'd19198c8',
@@ -980,13 +980,6 @@ return array(
       'javelin-dom',
       'javelin-router',
     ),
-    '0eee7a00' => array(
-      'javelin-dom',
-      'javelin-util',
-      'javelin-stratcom',
-      'javelin-install',
-      'javelin-workflow',
-    ),
     '0f764c35' => array(
       'javelin-install',
       'javelin-util',
@@ -1120,6 +1113,13 @@ return array(
       'javelin-install',
       'javelin-event',
     ),
+    '2e069f79' => array(
+      'javelin-dom',
+      'javelin-util',
+      'javelin-stratcom',
+      'javelin-install',
+      'javelin-workflow',
+    ),
     '2ee659ce' => array(
       'javelin-install',
     ),
@@ -1462,6 +1462,12 @@ return array(
       'javelin-vector',
       'javelin-dom',
     ),
+    '74caa17f' => array(
+      'javelin-install',
+      'javelin-util',
+      'javelin-dom',
+      'javelin-vector',
+    ),
     '76b9fc3e' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1587,12 +1593,6 @@ return array(
       'javelin-stratcom',
       'javelin-install',
     ),
-    '8fadb715' => array(
-      'javelin-install',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-vector',
-    ),
     '8ff5e24c' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/webroot/rsrc/js/application/diff/ScrollObjective.js b/webroot/rsrc/js/application/diff/ScrollObjective.js
index 4e6fa55d6a..c9fd4bb67e 100644
--- a/webroot/rsrc/js/application/diff/ScrollObjective.js
+++ b/webroot/rsrc/js/application/diff/ScrollObjective.js
@@ -100,6 +100,7 @@ JX.install('ScrollObjective', {
       JX.Stratcom.addSigil(node, 'has-tooltip');
       JX.Stratcom.getData(node).tip = tip;
       JX.Stratcom.getData(node).align = 'W';
+      JX.Stratcom.getData(node).size = 'auto';
       return this;
     },
 
diff --git a/webroot/rsrc/js/core/ToolTip.js b/webroot/rsrc/js/core/ToolTip.js
index 6fef44ab55..64a2deb301 100644
--- a/webroot/rsrc/js/core/ToolTip.js
+++ b/webroot/rsrc/js/core/ToolTip.js
@@ -50,7 +50,11 @@ JX.install('Tooltip', {
         { className: 'jx-tooltip-container' },
         node_inner);
 
-      node.style.maxWidth  = scale + 'px';
+      if (scale == 'auto') {
+        node.style.maxWidth = '';
+      } else {
+        node.style.maxWidth = scale + 'px';
+      }
 
       JX.Tooltip.hide();
       self._node = node;