diff --git a/app/assets/javascripts/discourse/dialects/fix_block_quotes.js b/app/assets/javascripts/discourse/dialects/fix_block_quotes.js
deleted file mode 100644
index 87bbafa18b3..00000000000
--- a/app/assets/javascripts/discourse/dialects/fix_block_quotes.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// There's a weird issue with the markdown parser where it won't process simple blockquotes
-// when they are prefixed with spaces. This fixes it.
-Discourse.Dialect.on("register", function(event) {
-  var dialect = event.dialect,
-      MD = event.MD;
-
-  dialect.block["fix_block_quotes"] = function(block, next) {
-    var m = /(^|\n) +(\>[\s\S]*)/.exec(block);
-    if (m && m[2] && m[2].length) {
-      var blockContents = block.replace(/(^|\n) +\>/, "$1>");
-      next.unshift(blockContents);
-      return [];
-    }
-  };
-
-});
\ No newline at end of file
diff --git a/vendor/assets/javascripts/better_markdown.js b/vendor/assets/javascripts/better_markdown.js
index dd5bc2d7f0f..ab3ffaae690 100644
--- a/vendor/assets/javascripts/better_markdown.js
+++ b/vendor/assets/javascripts/better_markdown.js
@@ -719,6 +719,13 @@ Markdown.dialects.Gruber = {
 
     blockquote: function blockquote( block, next ) {
 
+      var m = /(^|\n) +(\>[\s\S]*)/.exec(block);
+      if (m && m[2] && m[2].length) {
+        var blockContents = block.replace(/(^|\n) +\>/, "$1>");
+        next.unshift(blockContents);
+        return [];
+      }
+
       if ( !block.match( /^>/m ) )
         return undefined;