diff --git a/framework/core/js/lib/initializers/timestamps.js b/framework/core/js/lib/initializers/timestamps.js
index dabfe318f..67b7f43d2 100644
--- a/framework/core/js/lib/initializers/timestamps.js
+++ b/framework/core/js/lib/initializers/timestamps.js
@@ -1,140 +1,10 @@
 import humanTime from 'flarum/utils/human-time';
 
 export default function(app) {
-  // perhaps get rid of this and just m.redraw every minute?
-
-  // Livestamp.js / v1.1.2 / (c) 2012 Matt Bradley / MIT License
-  // @todo rewrite this to be simpler and cleaner
-  (function($, moment) {
-    var updateInterval = 1e3,
-        paused = false,
-        $livestamps = $([]),
-
-    init = function() {
-      livestampGlobal.resume();
-    },
-
-    prep = function($el, timestamp) {
-      var oldData = $el.data('livestampdata');
-      if (typeof timestamp == 'number')
-        timestamp *= 1e3;
-
-      $el.removeAttr('data-humantime')
-        .removeData('humantime');
-
-      timestamp = moment(timestamp);
-      if (moment().diff(timestamp) > 60 * 60) {
-          return;
-      }
-      if (moment.isMoment(timestamp) && !isNaN(+timestamp)) {
-        var newData = $.extend({ }, { 'original': $el.contents() }, oldData);
-        newData.moment = moment(timestamp);
-
-        $el.data('livestampdata', newData).empty();
-        $livestamps.push($el[0]);
-      }
-    },
-
-    run = function() {
-      if (paused) return;
-      livestampGlobal.update();
-      setTimeout(run, updateInterval);
-    },
-
-    livestampGlobal = {
-      update: function() {
-        $('[data-humantime]').each(function() {
-          var $this = $(this);
-          prep($this, $this.attr('datetime'));
-        });
-
-        var toRemove = [];
-        $livestamps.each(function() {
-          var $this = $(this),
-              data = $this.data('livestampdata');
-
-          if (data === undefined)
-            toRemove.push(this);
-          else if (moment.isMoment(data.moment)) {
-            var from = $this.html(),
-              to = humanTime(data.moment);
-                // to = data.moment.fromNow();
-
-            if (from != to) {
-              var e = $.Event('change.livestamp');
-              $this.trigger(e, [from, to]);
-              if (!e.isDefaultPrevented())
-                $this.html(to);
-            }
-          }
-        });
-
-        $livestamps = $livestamps.not(toRemove);
-      },
-
-      pause: function() {
-        paused = true;
-      },
-
-      resume: function() {
-        paused = false;
-        run();
-      },
-
-      interval: function(interval) {
-        if (interval === undefined)
-          return updateInterval;
-        updateInterval = interval;
-      }
-    },
-
-    livestampLocal = {
-      add: function($el, timestamp) {
-        if (typeof timestamp == 'number')
-          timestamp *= 1e3;
-        timestamp = moment(timestamp);
-
-        if (moment.isMoment(timestamp) && !isNaN(+timestamp)) {
-          $el.each(function() {
-            prep($(this), timestamp);
-          });
-          livestampGlobal.update();
-        }
-
-        return $el;
-      },
-
-      destroy: function($el) {
-        $livestamps = $livestamps.not($el);
-        $el.each(function() {
-          var $this = $(this),
-              data = $this.data('livestampdata');
-
-          if (data === undefined)
-            return $el;
-
-          $this
-            .html(data.original ? data.original : '')
-            .removeData('livestampdata');
-        });
-
-        return $el;
-      },
-
-      isLivestamp: function($el) {
-        return $el.data('livestampdata') !== undefined;
-      }
-    };
-
-    $.livestamp = livestampGlobal;
-    $(init);
-    $.fn.livestamp = function(method, options) {
-      if (!livestampLocal[method]) {
-        options = method;
-        method = 'add';
-      }
-
-      return livestampLocal[method](this, options);
-    };
-  })(jQuery, moment);
+  setInterval(function() {
+    $('[data-humantime]').each(function() {
+      var $this = $(this);
+      $this.html(humanTime($this.attr('datetime')));
+    });
+  }, 1000);
 }