diff --git a/src/mini/ready.html b/src/mini/ready.html
index f1e72499a8..ee17ead1b5 100644
--- a/src/mini/ready.html
+++ b/src/mini/ready.html
@@ -153,11 +153,6 @@
         this._attachedPending = false;
         this.attachedCallback();
       }
-      // only call detached if the element is actually detached
-      if (this._detachedPending && !Polymer.dom(document.body).deepContains(this)) {
-        this._attachedPending = false;
-        this.detachedCallback();
-      }
     },
 
     // for system overriding
@@ -196,12 +191,10 @@
       if (this._readied) {
         baseDetachedCallback.call(this);
       } else {
-        this._detachedPending = true;
+        this._attachedPending = false;
       }
     }
 
-
-
   });
 
 })();
diff --git a/test/unit/element-disable-upgrade.html b/test/unit/element-disable-upgrade.html
index cc529ffa25..5cc27c3fe4 100644
--- a/test/unit/element-disable-upgrade.html
+++ b/test/unit/element-disable-upgrade.html
@@ -181,16 +181,16 @@
       el.removeAttribute('disable-upgrade');
       assert.ok(el._wasAttached);
     });
-    test('detached does not fire when element is not yet enabled', function() {
+    test('attached/detached do not fire when element is not yet enabled', function() {
       el.parentNode.removeChild(el);
       Polymer.dom.flush();
       assert.notOk(el._wasAttached);
       assert.notOk(el._wasDetached);
       el.removeAttribute('disable-upgrade');
-      assert.ok(el._wasAttached);
-      assert.ok(el._wasDetached);
+      assert.notOk(el._wasAttached);
+      assert.notOk(el._wasDetached);
     });
-    test('detached does not fire when element is detached/attached when not yet enabled', function() {
+    test('attached/detached do not fire when element is detached/attached when not yet enabled', function() {
       var parent = el.parentNode;
       parent.removeChild(el);
       Polymer.dom.flush();