From c1caa901f06666760bd617b2fd9a427d7fa3b971 Mon Sep 17 00:00:00 2001
From: Matthew Beale <matt.beale@madhatted.com>
Date: Thu, 13 Aug 2015 02:18:08 -0400
Subject: [PATCH] [CLEANUP beta] Remove collection helper without flag

(cherry picked from commit ba0b6360e2cfec8632b0d963c8696caf69814d25)
---
 packages/ember-htmlbars/lib/env.js                       | 2 +-
 packages/ember-htmlbars/tests/helpers/collection_test.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/ember-htmlbars/lib/env.js b/packages/ember-htmlbars/lib/env.js
index 2dd29a6e58c..7b82a2c2d87 100644
--- a/packages/ember-htmlbars/lib/env.js
+++ b/packages/ember-htmlbars/lib/env.js
@@ -89,7 +89,6 @@ registerKeyword('component', componentKeyword);
 registerKeyword('partial', partial);
 registerKeyword('input', input);
 registerKeyword('textarea', textarea);
-registerKeyword('collection', collection);
 registerKeyword('legacy-yield', legacyYield);
 registerKeyword('mut', mut);
 registerKeyword('@mut', privateMut);
@@ -97,6 +96,7 @@ registerKeyword('each', each);
 registerKeyword('readonly', readonly);
 
 if (_Ember.ENV._ENABLE_LEGACY_VIEW_SUPPORT) {
+  registerKeyword('collection', collection);
   registerKeyword('view', view);
 }
 
diff --git a/packages/ember-htmlbars/tests/helpers/collection_test.js b/packages/ember-htmlbars/tests/helpers/collection_test.js
index 1b41d1c9960..f1c6576242e 100644
--- a/packages/ember-htmlbars/tests/helpers/collection_test.js
+++ b/packages/ember-htmlbars/tests/helpers/collection_test.js
@@ -36,7 +36,7 @@ function firstGrandchild(view) {
   return get(get(view, 'childViews').objectAt(0), 'childViews').objectAt(0);
 }
 
-QUnit.module('collection helper', {
+QUnit.module('collection helper [LEGACY]', {
   setup() {
     originalViewKeyword = registerKeyword('view',  viewKeyword);