diff --git a/src/lib/dom-module.html b/src/lib/dom-module.html
index 36903984f2..bc7e24f197 100644
--- a/src/lib/dom-module.html
+++ b/src/lib/dom-module.html
@@ -98,12 +98,16 @@
   document.registerElement('dom-module', DomModule);
 
   function forceDocumentUpgrade() {
+    var script = document._currentScript || document.currentScript;
+    var doc = script && script.ownerDocument || document;
+    if (!doc) {
+      return;
+    }
+    if (HTMLTemplateElement && HTMLTemplateElement.bootstrap) {
+      HTMLTemplateElement.bootstrap(doc);
+    }
     if (cePolyfill) {
-      var script = document._currentScript || document.currentScript;
-      var doc = script && script.ownerDocument || document;
-      if (doc) {
-        CustomElements.upgradeAll(doc);
-      }
+      CustomElements.upgradeAll(doc);
     }
   }
 
diff --git a/src/mini/template.html b/src/mini/template.html
index 9f652bc387..f4e7d01942 100644
--- a/src/mini/template.html
+++ b/src/mini/template.html
@@ -33,12 +33,6 @@
           'must not be a type-extension, found', this._template,
           'Move inside simple <template>.'));
       }
-      // bootstrap the template if it has not already been
-      if (this._template && !this._template.content && HTMLTemplateElement.bootstrap) {
-        HTMLTemplateElement.decorate(this._template);
-        // recurse if necessary
-        HTMLTemplateElement.bootstrap(this._template.content);
-      }
     },
 
     _stampTemplate: function() {