diff --git a/Gemfile b/Gemfile
index 7bbfc278c..96e663ba6 100644
--- a/Gemfile
+++ b/Gemfile
@@ -39,9 +39,6 @@ gem 'elasticsearch-rails'
 gem 'mailgun-ruby'
 gem 'resolv'
 
-# needed for looser jpeg header compat
-gem 'ruby-imagespec', :require => "image_spec", :git => "https://github.com/r888888888/ruby-imagespec.git", :branch => "exif-fixes"
-
 group :production, :staging do
   gem 'unicorn', :platforms => :ruby
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index bf7dfe431..1ac53fe1c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,3 @@
-GIT
-  remote: https://github.com/r888888888/ruby-imagespec.git
-  revision: 2dab9811f4abb4fbaeea66feb42e388ba545b2d8
-  branch: exif-fixes
-  specs:
-    ruby-imagespec (0.3.1)
-
 GIT
   remote: https://github.com/zwagoth/dtext_rb.git
   revision: efc37c7795c53425935245cde57cef2121b4f402
@@ -400,7 +393,6 @@ DEPENDENCIES
   resolv
   responders
   retriable
-  ruby-imagespec!
   ruby-vips
   sanitize
   shoulda-context
diff --git a/app/logical/file_methods.rb b/app/logical/file_methods.rb
index 7122fad2a..c7fe8db58 100644
--- a/app/logical/file_methods.rb
+++ b/app/logical/file_methods.rb
@@ -69,8 +69,8 @@ module FileMethods
       [video.width, video.height]
 
     elsif is_image?
-      image_size = ImageSpec.new(file_path)
-      [image_size.width, image_size.height]
+      image = Vips::Image.new_from_file(file_path)
+      [image.width, image.height]
 
     else
       [0, 0]
diff --git a/test/models/upload_service_test.rb b/test/models/upload_service_test.rb
index a25d0a89e..f64809502 100644
--- a/test/models/upload_service_test.rb
+++ b/test/models/upload_service_test.rb
@@ -105,10 +105,12 @@ class UploadServiceTest < ActiveSupport::TestCase
             preview, crop, sample = subject.generate_resizes(@file, @upload)
             assert_operator(File.size(preview.path), :>, 0)
             assert_operator(File.size(crop.path), :>, 0)
-            assert_equal(150, ImageSpec.new(preview.path).width)
-            assert_equal(150, ImageSpec.new(preview.path).height)
-            assert_equal(150, ImageSpec.new(crop.path).width)
-            assert_equal(150, ImageSpec.new(crop.path).height)
+            preview_image = Vips::Image.new_from_file(preview.path)
+            crop_image = Vips::Image.new_from_file(crop.path)
+            assert_equal(150, preview_image.width)
+            assert_equal(150, preview_image.height)
+            assert_equal(150, crop_image.width)
+            assert_equal(150, crop_image.height)
             preview.close
             preview.unlink
             crop.close