diff --git a/Gemfile b/Gemfile
index 59a10f8b00f..1726d715cdb 100644
--- a/Gemfile
+++ b/Gemfile
@@ -117,7 +117,9 @@ gem 'eventmachine'
 gem 'fast_xs'
 
 gem 'fast_xor'
-gem 'fastimage'
+
+# while we sort out https://github.com/sdsykes/fastimage/pull/46
+gem 'fastimage_discourse', require: 'fastimage'
 gem 'fog', '1.26.0', require: false
 gem 'unf', require: false
 
diff --git a/Gemfile.lock b/Gemfile.lock
index b00ea6668a0..4b60ab50aaf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,7 +41,6 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
     annotate (2.6.5)
       activerecord (>= 2.3.0)
       rake (>= 0.8.7)
@@ -101,8 +100,7 @@ GEM
       rake
       rake-compiler
     fast_xs (0.8.0)
-    fastimage (1.6.3)
-      addressable (~> 2.3, >= 2.3.5)
+    fastimage_discourse (1.6.6)
     ffi (1.9.6)
     fission (0.5.0)
       CFPropertyList (~> 2.2)
@@ -477,7 +475,7 @@ DEPENDENCIES
   fast_blank
   fast_xor
   fast_xs
-  fastimage
+  fastimage_discourse
   flamegraph
   fog (= 1.26.0)
   foreman