diff --git a/lib/banzai/pipeline/gfm_pipeline.rb b/lib/banzai/pipeline/gfm_pipeline.rb
index a1f24e8b0931a079f536cba094c01b55427bb592..0d9b874ef857570cad83628672f831164c1776ab 100644
--- a/lib/banzai/pipeline/gfm_pipeline.rb
+++ b/lib/banzai/pipeline/gfm_pipeline.rb
@@ -44,11 +44,7 @@ module Banzai
       def self.transform_context(context)
         context[:only_path] = true unless context.key?(:only_path)
 
-        context.merge(
-          # EmojiFilter
-          asset_host: Gitlab::Application.config.asset_host,
-          asset_root: Gitlab.config.gitlab.base_url
-        )
+        context
       end
     end
   end
diff --git a/spec/lib/banzai/filter/emoji_filter_spec.rb b/spec/lib/banzai/filter/emoji_filter_spec.rb
index 10910f22d4a3e688f0f1a9baf09a98175438fd30..85a4619e33d9fb59edaf034bc2d16afc29ae66ea 100644
--- a/spec/lib/banzai/filter/emoji_filter_spec.rb
+++ b/spec/lib/banzai/filter/emoji_filter_spec.rb
@@ -3,15 +3,6 @@ require 'spec_helper'
 describe Banzai::Filter::EmojiFilter do
   include FilterSpecHelper
 
-  before do
-    @original_asset_host = ActionController::Base.asset_host
-    ActionController::Base.asset_host = 'https://foo.com'
-  end
-
-  after do
-    ActionController::Base.asset_host = @original_asset_host
-  end
-
   it 'replaces supported name emoji' do
     doc = filter('<p>:heart:</p>')
     expect(doc.css('gl-emoji').first.text).to eq '❤'