diff --git a/packages/ember-htmlbars/lib/helpers/collection.js b/packages/ember-htmlbars/lib/helpers/collection.js
index 72eaae259ce..2a9c99a2d0e 100644
--- a/packages/ember-htmlbars/lib/helpers/collection.js
+++ b/packages/ember-htmlbars/lib/helpers/collection.js
@@ -13,7 +13,6 @@ import { map } from 'ember-metal/enumerable_utils';
 import {
   streamifyClassNameBinding
 } from "ember-views/streams/class_name_binding";
-import { Binding } from 'ember-metal/binding';
 import mergeViewBindings from "ember-htmlbars/system/merge-view-bindings";
 
 /**
@@ -229,12 +228,6 @@ export function collectionHelper(params, hash, options, env) {
   }
   if (emptyViewClass) { hash.emptyView = emptyViewClass; }
 
-  if (hash.keyword) {
-    itemHash._contextBinding = Binding.oneWay('_parentView.context');
-  } else {
-    itemHash._contextBinding = Binding.oneWay('content');
-  }
-
   var viewOptions = mergeViewBindings(this, {}, itemHash);
 
   if (hash.itemClassBinding) {
diff --git a/packages/ember-views/lib/views/collection_view.js b/packages/ember-views/lib/views/collection_view.js
index a439b7f798e..99d9a3e66f1 100644
--- a/packages/ember-views/lib/views/collection_view.js
+++ b/packages/ember-views/lib/views/collection_view.js
@@ -355,7 +355,7 @@ var CollectionView = ContainerView.extend({
 
       for (idx = start; idx < start+added; idx++) {
         item = content.objectAt(idx);
-
+        itemViewProps._context = this.keyword ? this.get('context') : item;
         itemViewProps.content = item;
         itemViewProps.contentIndex = idx;