diff --git a/app/assets/javascripts/discourse/components/group-post-stream.js.es6 b/app/assets/javascripts/discourse/components/group-post-stream.js.es6
deleted file mode 100644
index fc83f2dbb62..00000000000
--- a/app/assets/javascripts/discourse/components/group-post-stream.js.es6
+++ /dev/null
@@ -1,8 +0,0 @@
-export default Ember.Component.extend({
-  actions: {
-    // TODO: When on Ember 1.13, use a closure action
-    loadMore() {
-      this.sendAction('loadMore');
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs b/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs
deleted file mode 100644
index a67a93d4e59..00000000000
--- a/app/assets/javascripts/discourse/templates/components/group-post-stream.js.hbs
+++ /dev/null
@@ -1,11 +0,0 @@
-{{#load-more selector=".user-stream .item" action="loadMore"}}
-  <div class='user-stream'>
-    {{#each posts as |post|}}
-      {{group-post post=post}}
-    {{else}}
-      <div>{{i18n emptyText}}</div>
-    {{/each}}
-  </div>
-{{/load-more}}
-
-{{conditional-loading-spinner condition=loading}}
diff --git a/app/assets/javascripts/discourse/templates/group-activity-posts.hbs b/app/assets/javascripts/discourse/templates/group-activity-posts.hbs
index 7dbeebb3007..fd8a69a47dd 100644
--- a/app/assets/javascripts/discourse/templates/group-activity-posts.hbs
+++ b/app/assets/javascripts/discourse/templates/group-activity-posts.hbs
@@ -1 +1,11 @@
-{{group-post-stream posts=model emptyText=emptyText loadMore="loadMore" loading=loading}}
+{{#load-more selector=".user-stream .item" action=(action "loadMore")}}
+  <div class='user-stream'>
+    {{#each model as |post|}}
+      {{group-post post=post}}
+    {{else}}
+      <div>{{i18n emptyText}}</div>
+    {{/each}}
+  </div>
+{{/load-more}}
+
+{{conditional-loading-spinner condition=loading}}