diff --git a/app/components/record-filter.js b/app/components/record-filter.js
deleted file mode 100644
index f683a24efc..0000000000
--- a/app/components/record-filter.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import { computed } from '@ember/object';
-import Component from '@ember/component';
-export default Component.extend({
-  filterValue: null,
-  checked: computed('filterValue', 'model.name', function() {
-    return this.filterValue === this.get('model.name');
-  })
-});
diff --git a/app/templates/components/record-filter.hbs b/app/templates/components/record-filter.hbs
deleted file mode 100644
index f4a0b59217..0000000000
--- a/app/templates/components/record-filter.hbs
+++ /dev/null
@@ -1 +0,0 @@
-{{yield this}}
diff --git a/app/templates/records-toolbar.hbs b/app/templates/records-toolbar.hbs
index 93c2e34343..6748d697c6 100644
--- a/app/templates/records-toolbar.hbs
+++ b/app/templates/records-toolbar.hbs
@@ -7,24 +7,18 @@
   <Ui::ToolbarDivider />
 
   <button
-    class="{{if noFilterValue "active"}} toolbar__radio js-filter"
-    {{action "setFilter"}}
+    class="{{if (is-empty this.filterValue) "active"}} toolbar__radio js-filter"
+    {{on "click" (fn this.setFilter "")}}
   >
     All
   </button>
 
-  {{#each filters as |item|}}
-    {{#record-filter
-      model=item
-      filterValue=filterValue
-    as |filter|
-    }}
-      <button
-        class="{{if filter.checked "active"}} toolbar__radio js-filter"
-        {{action "setFilter" filter.model.name}}
-      >
-        {{filter.model.desc}}
-      </button>
-    {{/record-filter}}
+  {{#each this.filters as |filter|}}
+    <button
+      class="{{if (eq this.filterValue filter.name) "active"}} toolbar__radio js-filter"
+      {{on "click" (fn this.setFilter filter.name)}}
+    >
+      {{filter.desc}}
+    </button>
   {{/each}}
 </div>