diff --git a/assets/javascripts/discourse/components/hljs-code-view.js.es6 b/assets/javascripts/discourse/components/hljs-code-view.js.es6
index bcacc7a..20da0b2 100644
--- a/assets/javascripts/discourse/components/hljs-code-view.js.es6
+++ b/assets/javascripts/discourse/components/hljs-code-view.js.es6
@@ -1,24 +1,6 @@
 import { on, observes } from "ember-addons/ember-computed-decorators";
 import debounce from "discourse/lib/debounce";
 import highlightSyntax from "discourse/lib/highlight-syntax";
-import { bufferedRender } from "discourse-common/lib/buffered-render";
 
 export default Ember.Component.extend(
-  bufferedRender({
-    buildBuffer(buffer) {
-      buffer.push("<pre><code class='" + this.codeClass + "'>");
-      buffer.push(Handlebars.Utils.escapeExpression(this.value));
-      buffer.push("</code></pre>");
-    },
-
-    @observes("value")
-    _refreshHighlight: debounce(function() {
-      this.rerenderBuffer();
-    }, 50),
-
-    @on("didInsertElement")
-    _applyHighlight() {
-      highlightSyntax($(this.element));
-    }
-  })
 );
diff --git a/assets/javascripts/discourse/templates/components/hljs-code-view.hbs b/assets/javascripts/discourse/templates/components/hljs-code-view.hbs
new file mode 100644
index 0000000..adffeb4
--- /dev/null
+++ b/assets/javascripts/discourse/templates/components/hljs-code-view.hbs
@@ -0,0 +1 @@
+<pre><code class={{codeClass}}>{{value}}</code></pre>