diff --git a/src/CollapsableNav.js b/src/CollapsableNav.js
index 07a7a2f928..3f3ee153c5 100644
--- a/src/CollapsableNav.js
+++ b/src/CollapsableNav.js
@@ -1,7 +1,18 @@
-import CollapsibleNav from './CollapsibleNav';
+import React from 'react';
+import deprecationWarning from './utils/deprecationWarning';
+import assign from './utils/Object.assign';
+import {specCollapsibleNav} from './CollapsibleNav';
 
-let CollapsableNav = CollapsibleNav;
+const specCollapsableNav = assign({}, specCollapsibleNav, {
+  componentDidMount() {
+    deprecationWarning(
+      'CollapsableNav',
+      'CollapsibleNav',
+      'https://github.com/react-bootstrap/react-bootstrap/issues/425#issuecomment-97110963'
+    );
+  }
+});
 
-CollapsableNav.__deprecated__ = true;
+const CollapsableNav = React.createClass(specCollapsableNav);
 
 export default CollapsableNav;
diff --git a/src/CollapsibleNav.js b/src/CollapsibleNav.js
index 879c74ccd0..fe193e9f69 100644
--- a/src/CollapsibleNav.js
+++ b/src/CollapsibleNav.js
@@ -3,12 +3,11 @@ import BootstrapMixin from './BootstrapMixin';
 import CollapsibleMixin from './CollapsibleMixin';
 import classNames from 'classnames';
 import domUtils from './utils/domUtils';
-import deprecationWarning from './utils/deprecationWarning';
 
 import ValidComponentChildren from './utils/ValidComponentChildren';
 import createChainedFunction from './utils/createChainedFunction';
 
-const CollapsibleNav = React.createClass({
+const specCollapsibleNav = {
   mixins: [BootstrapMixin, CollapsibleMixin],
 
   propTypes: {
@@ -43,16 +42,6 @@ const CollapsibleNav = React.createClass({
     return height;
   },
 
-  componentDidMount() {
-    if (this.constructor.__deprecated__) {
-      deprecationWarning(
-        'CollapsableNav',
-        'CollapsibleNav',
-        'https://github.com/react-bootstrap/react-bootstrap/issues/425#issuecomment-97110963'
-      );
-    }
-  },
-
   render() {
     /*
      * this.props.collapsable is set in NavBar when a eventKey is supplied.
@@ -127,6 +116,9 @@ const CollapsibleNav = React.createClass({
       }
     );
   }
-});
+};
+
+const CollapsibleNav = React.createClass(specCollapsibleNav);
 
+export {specCollapsibleNav};
 export default CollapsibleNav;