diff --git a/resources/celerity/map.php b/resources/celerity/map.php
index 23726438a7..183f0fa7f3 100644
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -395,7 +395,7 @@ return array(
     'rsrc/js/application/drydock/drydock-live-operation-status.js' => '901935ef',
     'rsrc/js/application/files/behavior-icon-composer.js' => '8499b6ab',
     'rsrc/js/application/files/behavior-launch-icon-composer.js' => '48086888',
-    'rsrc/js/application/herald/HeraldRuleEditor.js' => '5bd8f385',
+    'rsrc/js/application/herald/HeraldRuleEditor.js' => '746ca158',
     'rsrc/js/application/herald/PathTypeahead.js' => 'f7fc67ec',
     'rsrc/js/application/herald/herald-rule-editor.js' => '7ebaeed3',
     'rsrc/js/application/maniphest/behavior-batch-editor.js' => '782ab6e7',
@@ -552,7 +552,7 @@ return array(
     'global-drag-and-drop-css' => '697324ad',
     'harbormaster-css' => 'b0758ca5',
     'herald-css' => '826075fa',
-    'herald-rule-editor' => '5bd8f385',
+    'herald-rule-editor' => '746ca158',
     'herald-test-css' => 'a52e323e',
     'inline-comment-summary-css' => '51efda3a',
     'javelin-aphlict' => '5359e785',
@@ -1245,15 +1245,6 @@ return array(
       'javelin-uri',
       'javelin-routable',
     ),
-    '5bd8f385' => array(
-      'multirow-row-manager',
-      'javelin-install',
-      'javelin-util',
-      'javelin-dom',
-      'javelin-stratcom',
-      'javelin-json',
-      'phabricator-prefab',
-    ),
     '5c54cbf3' => array(
       'javelin-behavior',
       'javelin-stratcom',
@@ -1370,6 +1361,15 @@ return array(
       'javelin-vector',
       'javelin-dom',
     ),
+    '746ca158' => array(
+      'multirow-row-manager',
+      'javelin-install',
+      'javelin-util',
+      'javelin-dom',
+      'javelin-stratcom',
+      'javelin-json',
+      'phabricator-prefab',
+    ),
     '76b9fc3e' => array(
       'javelin-behavior',
       'javelin-stratcom',
diff --git a/webroot/rsrc/js/application/herald/HeraldRuleEditor.js b/webroot/rsrc/js/application/herald/HeraldRuleEditor.js
index 6514567e19..ba01c9bef3 100644
--- a/webroot/rsrc/js/application/herald/HeraldRuleEditor.js
+++ b/webroot/rsrc/js/application/herald/HeraldRuleEditor.js
@@ -293,7 +293,17 @@ JX.install('HeraldRuleEditor', {
         },
         function(map) {
           for (var k in map) {
-            var v = JX.Prefab.transformDatasourceResults(map[k]);
+            var v = map[k];
+
+            // The control value may be set from wire values from the server,
+            // or a transformed value from another control, or a bare string
+            // value from another control.
+            if (typeof v == 'string') {
+              v = v;
+            } else if (!v.hasOwnProperty('id')) {
+              v = JX.Prefab.transformDatasourceResults(v);
+            }
+
             build.tokenizer.addToken(k, v);
           }
         }];