diff --git a/FEATURES.md b/FEATURES.md
index e26ddd95e52..e883d4bc870 100644
--- a/FEATURES.md
+++ b/FEATURES.md
@@ -18,11 +18,6 @@ for a detailed explanation.
   serially and call `reset()` each time), as well as being critical to
   for FastBoot.
 
-* `ember-debug-handlers`
-
-  Implements RFC https://github.com/emberjs/rfcs/pull/65, adding support for
-  custom deprecation and warning handlers.
-
 * `ember-routing-routable-components`
 
   Implements RFC https://github.com/emberjs/rfcs/pull/38, adding support for
diff --git a/features.json b/features.json
index f7c32a1e70e..628d6d1f50b 100644
--- a/features.json
+++ b/features.json
@@ -5,7 +5,6 @@
     "ember-test-helpers-fire-native-events": true,
     "ember-routing-route-configured-query-params": null,
     "ember-libraries-isregistered": null,
-    "ember-debug-handlers": true,
     "ember-routing-routable-components": null,
     "ember-metal-ember-assign": true,
     "ember-contextual-components": true,
diff --git a/packages/ember-debug/lib/index.js b/packages/ember-debug/lib/index.js
index 5054f1f1adf..f034d6c82ab 100644
--- a/packages/ember-debug/lib/index.js
+++ b/packages/ember-debug/lib/index.js
@@ -223,73 +223,72 @@ if (!Ember.testing) {
 */
 Ember.Debug = { };
 
-if (isEnabled('ember-debug-handlers')) {
-  /**
-    Allows for runtime registration of handler functions that override the default deprecation behavior.
-    Deprecations are invoked by calls to [Ember.deprecate](http://emberjs.com/api/classes/Ember.html#method_deprecate).
-    The following example demonstrates its usage by registering a handler that throws an error if the
-    message contains the word "should", otherwise defers to the default handler.
-
-    ```javascript
-    Ember.Debug.registerDeprecationHandler((message, options, next) => {
-      if (message.indexOf('should') !== -1) {
-        throw new Error(`Deprecation message with should: ${message}`);
-      } else {
-        // defer to whatever handler was registered before this one
-        next(message, options);
-      }
+/**
+  Allows for runtime registration of handler functions that override the default deprecation behavior.
+  Deprecations are invoked by calls to [Ember.deprecate](http://emberjs.com/api/classes/Ember.html#method_deprecate).
+  The following example demonstrates its usage by registering a handler that throws an error if the
+  message contains the word "should", otherwise defers to the default handler.
+
+  ```javascript
+  Ember.Debug.registerDeprecationHandler((message, options, next) => {
+    if (message.indexOf('should') !== -1) {
+      throw new Error(`Deprecation message with should: ${message}`);
+    } else {
+      // defer to whatever handler was registered before this one
+      next(message, options);
     }
-    ```
-
-    The handler function takes the following arguments:
-
-    <ul>
-      <li> <code>message</code> - The message received from the deprecation call.</li>
-      <li> <code>options</code> - An object passed in with the deprecation call containing additional information including:</li>
-        <ul>
-          <li> <code>id</code> - An id of the deprecation in the form of <code>package-name.specific-deprecation</code>.</li>
-          <li> <code>until</code> - The Ember version number the feature and deprecation will be removed in.</li>
-        </ul>
-      <li> <code>next</code> - A function that calls into the previously registered handler.</li>
-    </ul>
-
-    @public
-    @static
-    @method registerDeprecationHandler
-    @param handler {Function} A function to handle deprecation calls.
-    @since 2.1.0
-  */
-  Ember.Debug.registerDeprecationHandler = registerDeprecationHandler;
-  /**
-    Allows for runtime registration of handler functions that override the default warning behavior.
-    Warnings are invoked by calls made to [Ember.warn](http://emberjs.com/api/classes/Ember.html#method_warn).
-    The following example demonstrates its usage by registering a handler that does nothing overriding Ember's
-    default warning behavior.
-
-    ```javascript
-    // next is not called, so no warnings get the default behavior
-    Ember.Debug.registerWarnHandler(() => {});
-    ```
-
-    The handler function takes the following arguments:
-
-    <ul>
-      <li> <code>message</code> - The message received from the warn call. </li>
-      <li> <code>options</code> - An object passed in with the warn call containing additional information including:</li>
-        <ul>
-          <li> <code>id</code> - An id of the warning in the form of <code>package-name.specific-warning</code>.</li>
-        </ul>
-      <li> <code>next</code> - A function that calls into the previously registered handler.</li>
-    </ul>
-
-    @public
-    @static
-    @method registerWarnHandler
-    @param handler {Function} A function to handle warnings.
-    @since 2.1.0
-  */
-  Ember.Debug.registerWarnHandler = registerWarnHandler;
-}
+  }
+  ```
+
+  The handler function takes the following arguments:
+
+  <ul>
+    <li> <code>message</code> - The message received from the deprecation call.</li>
+    <li> <code>options</code> - An object passed in with the deprecation call containing additional information including:</li>
+      <ul>
+        <li> <code>id</code> - An id of the deprecation in the form of <code>package-name.specific-deprecation</code>.</li>
+        <li> <code>until</code> - The Ember version number the feature and deprecation will be removed in.</li>
+      </ul>
+    <li> <code>next</code> - A function that calls into the previously registered handler.</li>
+  </ul>
+
+  @public
+  @static
+  @method registerDeprecationHandler
+  @param handler {Function} A function to handle deprecation calls.
+  @since 2.1.0
+*/
+Ember.Debug.registerDeprecationHandler = registerDeprecationHandler;
+/**
+  Allows for runtime registration of handler functions that override the default warning behavior.
+  Warnings are invoked by calls made to [Ember.warn](http://emberjs.com/api/classes/Ember.html#method_warn).
+  The following example demonstrates its usage by registering a handler that does nothing overriding Ember's
+  default warning behavior.
+
+  ```javascript
+  // next is not called, so no warnings get the default behavior
+  Ember.Debug.registerWarnHandler(() => {});
+  ```
+
+  The handler function takes the following arguments:
+
+  <ul>
+    <li> <code>message</code> - The message received from the warn call. </li>
+    <li> <code>options</code> - An object passed in with the warn call containing additional information including:</li>
+      <ul>
+        <li> <code>id</code> - An id of the warning in the form of <code>package-name.specific-warning</code>.</li>
+      </ul>
+    <li> <code>next</code> - A function that calls into the previously registered handler.</li>
+  </ul>
+
+  @public
+  @static
+  @method registerWarnHandler
+  @param handler {Function} A function to handle warnings.
+  @since 2.1.0
+*/
+Ember.Debug.registerWarnHandler = registerWarnHandler;
+
 /*
   We are transitioning away from `ember.js` to `ember.debug.js` to make
   it much clearer that it is only for local development purposes.
diff --git a/packages/ember-metal/lib/index.js b/packages/ember-metal/lib/index.js
index 00ac4b4cf3d..59b09e13f2a 100644
--- a/packages/ember-metal/lib/index.js
+++ b/packages/ember-metal/lib/index.js
@@ -360,11 +360,8 @@ if (has('ember-debug')) {
   require('ember-debug');
 } else {
   Ember.Debug = { };
-
-  if (isEnabled('ember-debug-handlers')) {
-    Ember.Debug.registerDeprecationHandler = function() { };
-    Ember.Debug.registerWarnHandler = function() { };
-  }
+  Ember.Debug.registerDeprecationHandler = function() { };
+  Ember.Debug.registerWarnHandler = function() { };
 }
 
 Ember.create = deprecateFunc('Ember.create is deprecated in favor of Object.create', { id: 'ember-metal.ember-create', until: '3.0.0' }, Object.create);