diff --git a/app/assets/javascripts/admin/helpers/human-size.js.es6 b/app/assets/javascripts/admin/helpers/human-size.js.es6
new file mode 100644
index 00000000000..34d17402da9
--- /dev/null
+++ b/app/assets/javascripts/admin/helpers/human-size.js.es6
@@ -0,0 +1,3 @@
+Em.Handlebars.helper('human-size', function(size) {
+  return new Handlebars.SafeString(I18n.toHumanSize(size));
+});
diff --git a/app/assets/javascripts/discourse/controllers/share.js.es6 b/app/assets/javascripts/discourse/controllers/share.js.es6
index 2b86c3c97bb..fa8103005b4 100644
--- a/app/assets/javascripts/discourse/controllers/share.js.es6
+++ b/app/assets/javascripts/discourse/controllers/share.js.es6
@@ -3,6 +3,10 @@ import DiscourseController from 'discourse/controllers/controller';
 export default DiscourseController.extend({
   needs: ['topic'],
 
+  displayDate: function() {
+    return Discourse.Formatter.longDateNoYear(new Date(this.get('date')));
+  }.property('date'),
+
   // Close the share controller
   actions: {
     close: function() {
diff --git a/app/assets/javascripts/discourse/helpers/application_helpers.js b/app/assets/javascripts/discourse/helpers/application_helpers.js
index 1a1074969f4..d6245a15193 100644
--- a/app/assets/javascripts/discourse/helpers/application_helpers.js
+++ b/app/assets/javascripts/discourse/helpers/application_helpers.js
@@ -45,16 +45,6 @@ Handlebars.registerHelper('raw-date', function(property, options) {
   return Discourse.Formatter.longDate(dt);
 });
 
-/**
-  Nicely format a bound date without returning HTML
-
-  @method bound-raw-date
-  @for Handlebars
-**/
-Em.Handlebars.helper('bound-raw-date', function (date) {
-  return Discourse.Formatter.longDateNoYear(new Date(date));
-});
-
 /**
   Live refreshing age helper
 
@@ -138,46 +128,3 @@ Em.Handlebars.helper('bound-date', function(dt) {
   return new safe(Discourse.Formatter.autoUpdatingRelativeAge(new Date(dt), {format: 'medium', title: true }));
 });
 
-/**
-  Look for custom html content using `Discourse.HTML`. If none exists, look for a template
-  to render with that name.
-
-  @method custom-html
-  @for Handlebars
-**/
-Handlebars.registerHelper('custom-html', function(name, contextString, options) {
-  var html = Discourse.HTML.getCustomHTML(name);
-  if (html) { return html; }
-
-  var container = (options || contextString).data.keywords.controller.container;
-
-  if (container.lookup('template:' + name)) {
-    return Ember.Handlebars.helpers.partial.apply(this, arguments);
-  }
-});
-
-Em.Handlebars.helper('human-size', function(size) {
-  return new safe(I18n.toHumanSize(size));
-});
-
-/**
-  Renders the domain for a link if it's not internal and has a title.
-
-  @method link-domain
-  @for Handlebars
-**/
-Handlebars.registerHelper('link-domain', function(property, options) {
-  var link = Em.get(this, property, options);
-  if (link) {
-    var internal = Em.get(link, 'internal'),
-        hasTitle = (!Em.isEmpty(Em.get(link, 'title')));
-    if (hasTitle && !internal) {
-      var domain = Em.get(link, 'domain');
-      if (!Em.isEmpty(domain)) {
-        var s = domain.split('.');
-        domain = s[s.length-2] + "." + s[s.length-1];
-        return new safe("<span class='domain'>" + domain + "</span>");
-      }
-    }
-  }
-});
diff --git a/app/assets/javascripts/discourse/helpers/custom-html.js.es6 b/app/assets/javascripts/discourse/helpers/custom-html.js.es6
new file mode 100644
index 00000000000..0088a0bcef9
--- /dev/null
+++ b/app/assets/javascripts/discourse/helpers/custom-html.js.es6
@@ -0,0 +1,10 @@
+Handlebars.registerHelper('custom-html', function(name, contextString, options) {
+  var html = Discourse.HTML.getCustomHTML(name);
+  if (html) { return html; }
+
+  var container = (options || contextString).data.keywords.controller.container;
+
+  if (container.lookup('template:' + name)) {
+    return Ember.Handlebars.helpers.partial.apply(this, arguments);
+  }
+});
diff --git a/app/assets/javascripts/discourse/helpers/link-domain.js.es6 b/app/assets/javascripts/discourse/helpers/link-domain.js.es6
new file mode 100644
index 00000000000..b16255d9420
--- /dev/null
+++ b/app/assets/javascripts/discourse/helpers/link-domain.js.es6
@@ -0,0 +1,15 @@
+Handlebars.registerHelper('link-domain', function(property, options) {
+  var link = Em.get(this, property, options);
+  if (link) {
+    var internal = Em.get(link, 'internal'),
+        hasTitle = (!Em.isEmpty(Em.get(link, 'title')));
+    if (hasTitle && !internal) {
+      var domain = Em.get(link, 'domain');
+      if (!Em.isEmpty(domain)) {
+        var s = domain.split('.');
+        domain = s[s.length-2] + "." + s[s.length-1];
+        return new Handlebars.SafeString("<span class='domain'>" + domain + "</span>");
+      }
+    }
+  }
+});
diff --git a/app/assets/javascripts/discourse/templates/share.js.handlebars b/app/assets/javascripts/discourse/templates/share.js.handlebars
index 8ba4217c0ea..73ad0abf557 100644
--- a/app/assets/javascripts/discourse/templates/share.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/share.js.handlebars
@@ -1,7 +1,7 @@
 <h3>{{view.title}}</h3>
 
 {{#if date}}
-  <span class="date">{{bound-raw-date date}}</span>
+  <span class="date">{{displayDate}}</span>
 {{/if}}
 
 <div><input type='text' /></div>