diff --git a/src/browser/ui/ReactDOMComponent.js b/src/browser/ui/ReactDOMComponent.js
index e27634234bf..ceccd101189 100644
--- a/src/browser/ui/ReactDOMComponent.js
+++ b/src/browser/ui/ReactDOMComponent.js
@@ -18,6 +18,8 @@ var CSSPropertyOperations = require('CSSPropertyOperations');
 var DOMProperty = require('DOMProperty');
 var DOMPropertyOperations = require('DOMPropertyOperations');
 var ReactBrowserEventEmitter = require('ReactBrowserEventEmitter');
+var ReactComponentBrowserEnvironment =
+  require('ReactComponentBrowserEnvironment');
 var ReactMount = require('ReactMount');
 var ReactMultiChild = require('ReactMultiChild');
 var ReactPerf = require('ReactPerf');
@@ -475,7 +477,7 @@ ReactDOMComponent.Mixin = {
   unmountComponent: function() {
     this.unmountChildren();
     ReactBrowserEventEmitter.deleteAllListeners(this._rootNodeID);
-    ReactMount.purgeID(this._rootNodeID);
+    ReactComponentBrowserEnvironment.unmountIDFromEnvironment(this._rootNodeID);
     this._rootNodeID = null;
   }
 
diff --git a/src/browser/ui/ReactDOMTextComponent.js b/src/browser/ui/ReactDOMTextComponent.js
index fe1d1f6d5ca..c2b10fe2644 100644
--- a/src/browser/ui/ReactDOMTextComponent.js
+++ b/src/browser/ui/ReactDOMTextComponent.js
@@ -108,7 +108,6 @@ assign(ReactDOMTextComponent.prototype, {
   },
 
   unmountComponent: function() {
-    // TODO: Is this necessary?
     ReactComponentBrowserEnvironment.unmountIDFromEnvironment(this._rootNodeID);
   }
 
diff --git a/src/core/ReactCompositeComponent.js b/src/core/ReactCompositeComponent.js
index 2a336836be3..47d639e095d 100644
--- a/src/core/ReactCompositeComponent.js
+++ b/src/core/ReactCompositeComponent.js
@@ -257,8 +257,6 @@ var ReactCompositeComponentMixin = {
     this._pendingCallbacks = null;
     this._pendingElement = null;
 
-    ReactComponentEnvironment.unmountIDFromEnvironment(this._rootNodeID);
-
     // These fields do not really need to be reset since this object is no
     // longer accessible.
     this._context = null;
diff --git a/src/core/__tests__/ReactCompositeComponent-test.js b/src/core/__tests__/ReactCompositeComponent-test.js
index 43c94b31f51..5e66d8714ac 100644
--- a/src/core/__tests__/ReactCompositeComponent-test.js
+++ b/src/core/__tests__/ReactCompositeComponent-test.js
@@ -431,6 +431,7 @@ describe('ReactCompositeComponent', function() {
       render: function() {
         return <div>
           <Inner />
+          Text
         </div>;
       }
     });
@@ -452,11 +453,11 @@ describe('ReactCompositeComponent', function() {
     React.unmountComponentAtNode(container);
     expect(innerUnmounted).toBe(true);
 
-    // <Component />, <Inner />, and both <div /> elements and their wrappers
-    // each call unmountIDFromEnvironment which calls purgeID, for a total of 6.
+    // The text and both <div /> elements and their wrappers each call
+    // unmountIDFromEnvironment which calls purgeID, for a total of 3.
     // TODO: Test the effect of this. E.g. does the node cache get repopulated
     // after a getDOMNode call?
-    expect(ReactMount.purgeID.callCount).toBe(6);
+    expect(ReactMount.purgeID.callCount).toBe(3);
   });
 
   it('should warn when shouldComponentUpdate() returns undefined', function() {