Index: Gemfile
===================================================================
--- Gemfile	(revision 17844)
+++ Gemfile	(working copy)
@@ -10,9 +10,9 @@
 gem "roadie-rails", "~> 1.3.0"
 gem "mimemagic"
 gem "mail", "~> 2.7.1"
-gem "csv", "~> 3.0.1" if RUBY_VERSION >= "2.3" && RUBY_VERSION < "2.6"
+gem "csv", "~> 3.0.1" if RUBY_VERSION < "2.6"
 
-gem "nokogiri", (RUBY_VERSION >= "2.3" ? "~> 1.10.0" : "~> 1.9.1")
+gem "nokogiri", "~> 1.10.0"
 gem "i18n", "~> 0.7.0"
 
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
Index: app/controllers/imports_controller.rb
===================================================================
--- app/controllers/imports_controller.rb	(revision 17844)
+++ app/controllers/imports_controller.rb	(working copy)
@@ -50,8 +50,7 @@
       redirect_to import_mapping_path(@import)
     end
 
-  # TODO: Remove ArgumentError when support for Ruby 2.2 is dropped (#28689)
-  rescue CSV::MalformedCSVError, ArgumentError, EncodingError => e
+  rescue CSV::MalformedCSVError, EncodingError => e
     if e.is_a?(CSV::MalformedCSVError) && e.message !~ /Invalid byte sequence/
       flash.now[:error] = l(:error_invalid_csv_file_or_settings)
     else