diff --git a/packages/liveui/liveui.js b/packages/liveui/liveui.js
index 785c8c1d03..7c8d06c9c6 100644
--- a/packages/liveui/liveui.js
+++ b/packages/liveui/liveui.js
@@ -794,8 +794,9 @@ Meteor.ui = Meteor.ui || {};
 
     visitNodes(srcParent, null, null, function(src) {
       // XXX inefficient to scan for match for every node!
-      // We could skip non-element nodes, except for "range matches"
+      // We could at least skip non-element nodes, except for "range matches"
       // used for constant chunks, which may begin on a non-element.
+      // But really this shouldn't be a linear search.
       var pair = _.find(nodeMatches, function(p) {
         return p[1] === src;
       });
diff --git a/packages/templating/deftemplate.js b/packages/templating/deftemplate.js
index ec8b703000..30f187d130 100644
--- a/packages/templating/deftemplate.js
+++ b/packages/templating/deftemplate.js
@@ -36,6 +36,8 @@
 
       var react_data = { events: (name ? Template[name].events : {}),
                          data: data,
+                         // legacy 'id' preservation
+                         //preserve: { '*[id]': function(n) { return n.id; } },
                          branch: branch };
 
       return Meteor.ui.chunk(getHtml, react_data);