Avoid inadvertently loading an old tzinfo gem

activesupport/lib/active_support/vendor.rb

@@ -11,11 +11,6 @@
   rescue Gem::LoadError
   end
 
-  begin
-    gem 'tzinfo', '~> 0.3.13'
-  rescue Gem::LoadError
-  end
-
   begin
     gem 'i18n', '~> 0.1.3'
   rescue Gem::LoadError

activesupport/lib/active_support/vendor/tzinfo.rb

 begin
-  require 'tzinfo'
-rescue LoadError
-  $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'tzinfo-0.3.13', 'lib'))
-  retry
+  gem 'tzinfo', '~> 0.3.13'
+rescue Gem::LoadError
+  $LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/tzinfo-0.3.13/lib")
 end
+
+require 'tzinfo'