diff --git a/Gemfile b/Gemfile
index 71ee3f910c0..e54a9dc8819 100644
--- a/Gemfile
+++ b/Gemfile
@@ -90,9 +90,7 @@ gem 'unf', require: false
 
 gem 'email_reply_trimmer'
 
-# Forked until https://github.com/toy/image_optim/pull/162 is merged
-# https://github.com/discourse/image_optim
-gem 'discourse_image_optim', require: 'image_optim'
+gem 'image_optim'
 gem 'multi_json'
 gem 'mustache'
 gem 'nokogiri'
diff --git a/Gemfile.lock b/Gemfile.lock
index 02c9870dc06..cba9b033d36 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,12 +117,6 @@ GEM
     discourse-fonts (0.0.8)
     discourse_dev (0.2.1)
       faker (~> 2.16)
-    discourse_image_optim (0.26.2)
-      exifr (~> 1.2, >= 1.2.2)
-      fspath (~> 3.0)
-      image_size (~> 1.5)
-      in_threads (~> 1.3)
-      progress (~> 3.0, >= 3.0.1)
     docile (1.4.0)
     ecma-re-validator (0.3.0)
       regexp_parser (~> 2.0)
@@ -172,7 +166,13 @@ GEM
     http_accept_language (2.1.1)
     i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    image_size (1.5.0)
+    image_optim (0.30.0)
+      exifr (~> 1.2, >= 1.2.2)
+      fspath (~> 3.0)
+      image_size (>= 1.5, < 3)
+      in_threads (~> 1.3)
+      progress (~> 3.0, >= 3.0.1)
+    image_size (2.1.0)
     in_threads (1.5.4)
     jmespath (1.4.0)
     jquery-rails (4.4.0)
@@ -512,7 +512,6 @@ DEPENDENCIES
   discourse-ember-source (~> 3.12.2)
   discourse-fonts
   discourse_dev
-  discourse_image_optim
   email_reply_trimmer
   ember-handlebars-template (= 0.8.0)
   excon
@@ -526,6 +525,7 @@ DEPENDENCIES
   highline
   htmlentities
   http_accept_language
+  image_optim
   json
   json_schemer
   listen
diff --git a/lib/upload_creator.rb b/lib/upload_creator.rb
index cd2f4c11da3..9e4f9616034 100644
--- a/lib/upload_creator.rb
+++ b/lib/upload_creator.rb
@@ -424,8 +424,6 @@ class UploadCreator
     OptimizedImage.ensure_safe_paths!(@file.path)
     FileHelper.optimize_image!(@file.path)
     extract_image_info!
-  rescue ImageOptim::TimeoutExceeded
-    Rails.logger.warn("ImageOptim timed out while optimizing #{@filename}")
   end
 
   def filesize