diff --git a/src/lib/annotations/annotations.html b/src/lib/annotations/annotations.html
index 14c980f977..03741b2cee 100644
--- a/src/lib/annotations/annotations.html
+++ b/src/lib/annotations/annotations.html
@@ -233,7 +233,7 @@
             !node.hasAttribute('preserve-content')) {
             this._parseTemplate(node, i, list, annote);
           }
-          if (node.localName == 'slot' && node.hasAttribute('auto-content')) {
+          if (node.localName == 'slot') {
             node = this._replaceSlotWithContent(node);
           }
           // collapse adjacent textNodes: fixes an IE issue that can cause
@@ -277,7 +277,8 @@
         var attr = attrs[i];
         if (attr.name == 'name') {
           content.setAttribute('select', '[slot=\'' + attr.value + '\']');
-        } else {
+        }
+        if (attr.name !== 'select') {
           content.setAttribute(attr.name, attr.value);
         }
       }
diff --git a/test/unit/polymer-dom-content.html b/test/unit/polymer-dom-content.html
index 743089d405..6337bda960 100644
--- a/test/unit/polymer-dom-content.html
+++ b/test/unit/polymer-dom-content.html
@@ -32,7 +32,7 @@
 <dom-module id="x-dist-slot">
   <template>
     x-dist
-    <div id="distWrapper"><slot id="content" name="foo" auto-content></slot></div>
+    <div id="distWrapper"><slot id="content" name="foo"></slot></div>
   </template>
   <script>
   HTMLImports.whenReady(function() {