Revert emberjs#3218 and add deprecation notice for global Handlebars …

…lookups.

Conflicts:
	features.json

FEATURES.md

@@ -25,13 +25,6 @@ for a detailed explanation.
 
   Added in [#3655](https://github.com/emberjs/ember.js/pull/3655).
 
-* `ember-handlebars-caps-lookup`
-  Forces Handlebars values starting with capital letters, like `{{CONSTANT}}`,
-  to always be looked up on `Ember.lookup`. Previously, these values would be
-  looked up on the controller in certain cases.
-
-  Added in [#3218](https://github.com/emberjs/ember.js/pull/3218)
-
 * `ember-testing-simple-setup`
   Removes the need for most of the ceremony of setting up an application for testing. The following
   examples are equivalent:

features.json

@@ -4,7 +4,6 @@
     "query-params-new": null,
     "string-parameterize": null,
     "ember-routing-named-substates": null,
-    "ember-handlebars-caps-lookup": null,
     "ember-handlebars-log-primitives": true,
     "ember-testing-simple-setup": null,
     "ember-testing-routing-helpers": true,

packages/ember-handlebars/lib/ext.js

@@ -61,29 +61,17 @@ var handlebarsGet = Ember.Handlebars.get = function(root, path, options) {
       normalizedPath = normalizePath(root, path, data),
       value;
 
-  if (Ember.FEATURES.isEnabled("ember-handlebars-caps-lookup")) {
+  // In cases where the path begins with a keyword, change the
+  // root to the value represented by that keyword, and ensure
+  // the path is relative to it.
+  root = normalizedPath.root;
+  path = normalizedPath.path;
 
-    // If the path starts with a capital letter, look it up on Ember.lookup,
-    // which defaults to the `window` object in browsers.
-    if (Ember.isGlobalPath(path)) {
-      value = Ember.get(Ember.lookup, path);
-    } else {
-
-      // In cases where the path begins with a keyword, change the
-      // root to the value represented by that keyword, and ensure
-      // the path is relative to it.
-      value = Ember.get(normalizedPath.root, normalizedPath.path);
-    }
+  value = Ember.get(root, path);
 
-  } else {
-    root = normalizedPath.root;
-    path = normalizedPath.path;
-
-    value = Ember.get(root, path);
-
-    if (value === undefined && root !== Ember.lookup && Ember.isGlobalPath(path)) {
-      value = Ember.get(Ember.lookup, path);
-    }
+  if (value === undefined && root !== Ember.lookup && Ember.isGlobalPath(path)) {
+    Ember.deprecate("Global lookup from a Handlebars template is deprecated.");
+    value = Ember.get(Ember.lookup, path);
   }
 
   return value;