diff --git a/app/assets/javascripts/admin/templates/customize.js.handlebars b/app/assets/javascripts/admin/templates/customize.js.handlebars
index 893189605..44fcd9093 100644
--- a/app/assets/javascripts/admin/templates/customize.js.handlebars
+++ b/app/assets/javascripts/admin/templates/customize.js.handlebars
@@ -3,10 +3,10 @@
   <h3>{{i18n admin.customize.long_title}}</h3>
   <ul>
     {{#each content}}
-    <li><a {{action selectStyle this target="controller"}} {{bindAttr class="this.selected:active"}}>{{this.description}}</a></li>
+    <li><a {{action selectStyle this}} {{bindAttr class="this.selected:active"}}>{{this.description}}</a></li>
     {{/each}}
   </ul>
-  <button {{action newCustomization target="controller"}} class='btn'>{{i18n admin.customize.new}}</button>
+  <button {{action newCustomization}} class='btn'>{{i18n admin.customize.new}}</button>
 </div>
 
 
@@ -44,9 +44,9 @@
   </div>
 
   <div class='buttons'>
-    <button {{action save target="controller"}} {{bindAttr disabled="content.selectedItem.disableSave"}} class='btn'>{{i18n admin.customize.save}}</button>
+    <button {{action save}} {{bindAttr disabled="content.selectedItem.disableSave"}} class='btn'>{{i18n admin.customize.save}}</button>
     <span class='saving'>{{content.selectedItem.savingStatus}}</span>
-    <a {{action destroy target="controller"}} class='delete-link'>{{i18n admin.customize.delete}}</a>
+    <a {{action destroy}} class='delete-link'>{{i18n admin.customize.delete}}</a>
   </div>
 
 </div>
diff --git a/app/assets/javascripts/discourse/templates/composer.js.handlebars b/app/assets/javascripts/discourse/templates/composer.js.handlebars
index 81b40fbf2..800fcf194 100644
--- a/app/assets/javascripts/discourse/templates/composer.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/composer.js.handlebars
@@ -36,7 +36,7 @@
             {{#unless content.creatingPrivateMessage}}
               {{view Discourse.ComboboxViewCategory valueAttribute="name" contentBinding="Discourse.site.categories" valueBinding="content.categoryName"}}
               {{#if content.archetype.hasOptions}}
-                <button class='btn' {{action showOptions target="controller"}}>{{i18n topic.options}}</button>
+                <button class='btn' {{action showOptions}}>{{i18n topic.options}}</button>
               {{/if}}
               {{#if content.showAdminOptions}}
                 <button {{action toggleAdminOptions target="view"}} class="btn no-text" title='{{i18n composer.admin_options_title}}'><i class="icon icon-wrench"></i></button>
@@ -58,7 +58,7 @@
             <div id='wmd-preview' {{bindAttr class="hidePreview:hidden"}}></div>
           </div>
           {{#if Discourse.currentUser}}
-            <a href="#" {{action togglePreview target="controller"}} class='toggle-preview'>{{{content.toggleText}}}</a>
+            <a href="#" {{action togglePreview}} class='toggle-preview'>{{{content.toggleText}}}</a>
             <div id='draft-status'></div>
             {{#if view.loadingImage}}
               <div id="image-uploading">
@@ -70,8 +70,8 @@
 
         {{#if Discourse.currentUser}}
           <div class='submit-panel'>
-            <button {{action save target="controller"}} tabindex="4" {{bindAttr disabled="content.cantSubmitPost"}} class='btn btn-primary create'>{{view.content.saveText}}</button>
-            <a href='#' {{action cancel target="controller"}} class='cancel' tabindex="4">{{i18n cancel}}</a>
+            <button {{action save}} tabindex="4" {{bindAttr disabled="content.cantSubmitPost"}} class='btn btn-primary create'>{{view.content.saveText}}</button>
+            <a href='#' {{action cancel}} class='cancel' tabindex="4">{{i18n cancel}}</a>
           </div>
         {{/if}}
 
@@ -81,7 +81,7 @@
         <div class='span24'>
           <div class='saving-text'>
             {{#if content.createdPost}}
-              {{i18n composer.saved}} <a class='permalink' href="{{unbound createdPost.url}}" {{action viewNewReply target="controller"}}>{{i18n composer.view_new_post}}</a>
+              {{i18n composer.saved}} <a class='permalink' href="{{unbound createdPost.url}}" {{action viewNewReply}}>{{i18n composer.view_new_post}}</a>
             {{else}}
               {{i18n composer.saving}}
             {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/list/list.js.handlebars b/app/assets/javascripts/discourse/templates/list/list.js.handlebars
index 7e90248c5..eeaf6f750 100644
--- a/app/assets/javascripts/discourse/templates/list/list.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/list.js.handlebars
@@ -7,15 +7,15 @@
     </ul>
 
     {{#if canCreateTopic}}
-      <button class='btn btn-default' {{action createTopic target="controller"}}><i class='icon icon-plus'></i>{{view.createTopicText}}</button>
+      <button class='btn btn-default' {{action createTopic}}><i class='icon icon-plus'></i>{{view.createTopicText}}</button>
     {{/if}}
 
     {{#if canEditCategory}}
-      <button class='btn btn-default' {{action editCategory target="controller"}}>{{i18n category.edit_long}}</button>
+      <button class='btn btn-default' {{action editCategory}}>{{i18n category.edit_long}}</button>
     {{/if}}
 
     {{#if canCreateCategory}}
-      <button class='btn btn-default' {{action createCategory target="controller"}}><i class='icon icon-plus'></i>{{i18n category.create}}</button>
+      <button class='btn btn-default' {{action createCategory}}><i class='icon icon-plus'></i>{{i18n category.create}}</button>
     {{/if}}
 
   </div>
diff --git a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
index d90d06d5d..3d13b6b56 100644
--- a/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/topic_list_item.js.handlebars
@@ -36,7 +36,7 @@
           {{#unless canClearPin}}<a href="{{lastReadUrl}}">{{i18n read_more}}</a>{{/unless}}
         {{/if}}
         {{#if canClearPin}}
-          <a href="#" {{action clearPin this target="controller"}} title="{{unbound i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
+          <a href="#" {{action clearPin this}} title="{{unbound i18n topic.clear_pin.help}}">{{i18n topic.clear_pin.title}}</a>
         {{/if}}
       </div>
     {{/if}}
diff --git a/app/assets/javascripts/discourse/templates/list/topics.js.handlebars b/app/assets/javascripts/discourse/templates/list/topics.js.handlebars
index 08f972ba4..d5296e293 100644
--- a/app/assets/javascripts/discourse/templates/list/topics.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/topics.js.handlebars
@@ -34,7 +34,7 @@
               <td colspan="9">
                 <div class='alert alert-info'>
                   {{countI18n new_topics_inserted countBinding="view.insertedCount"}}
-                  <a href='#' {{action showInserted target="controller"}}>{{i18n show_new_topics}}</a>
+                  <a href='#' {{action showInserted}}>{{i18n show_new_topics}}</a>
                 </div>
               </td>
             </tr>
diff --git a/app/assets/javascripts/discourse/templates/topic_extra_info.js.handlebars b/app/assets/javascripts/discourse/templates/topic_extra_info.js.handlebars
index 3880b9421..289e93323 100644
--- a/app/assets/javascripts/discourse/templates/topic_extra_info.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/topic_extra_info.js.handlebars
@@ -1,5 +1,5 @@
 {{#if view.showFavoriteButton}}
-  <a {{bindAttr class=":star view.topic.starred:starred"}} {{action toggleStar target="controller"}} href='#' {{bindAttr title="view.topic.favoriteTooltip"}}></a>
+  <a {{bindAttr class=":star view.topic.starred:starred"}} {{action toggleStar}} href='#' {{bindAttr title="view.topic.favoriteTooltip"}}></a>
 {{/if}}
 
 <h1>
diff --git a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
index 16e86e361..1fc397467 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
@@ -35,7 +35,7 @@
   <div class="control-group">
     <label class="control-label">{{i18n user.password.title}}</label>
     <div class="controls">
-      <a href="#" {{action changePassword target="controller"}} class='btn'>{{i18n user.change_password.action}}</a> {{passwordProgress}}
+      <a href="#" {{action changePassword}} class='btn'>{{i18n user.change_password.action}}</a> {{passwordProgress}}
     </div>
   </div>
 
@@ -106,7 +106,7 @@
 
   <div class="control-group">
     <div class="controls">
-        <button {{action save target="controller"}} {{bindAttr disabled="saveDisabled"}} class="btn btn-primary">{{saveButtonText}}</button>
+        <button {{action save}} {{bindAttr disabled="saveDisabled"}} class="btn btn-primary">{{saveButtonText}}</button>
         {{#if saved}}{{i18n saved}}{{/if}}
     </div>
   </div>
diff --git a/app/assets/javascripts/discourse/templates/user/private_messages.js.handlebars b/app/assets/javascripts/discourse/templates/user/private_messages.js.handlebars
index f16c3c9b6..85038a13b 100644
--- a/app/assets/javascripts/discourse/templates/user/private_messages.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/private_messages.js.handlebars
@@ -1,11 +1,11 @@
-<div id='user-info'> 
+<div id='user-info'>
   <nav class='buttons'>
     {{#if content.can_edit}}
       {{#linkTo "preferences" class="btn"}}{{i18n user.edit}}{{/linkTo}}
     {{/if}}
     <br/>
     {{#if content.can_send_private_message_to_user}}
-    <button class='btn create' {{action composePrivateMessage target="controller"}}>
+    <button class='btn create' {{action composePrivateMessage}}>
       <i class='icon icon-plus'></i>
       {{i18n user.private_message}}
     </button>