6 files changed, 16 insertions, 32 deletions
diff --git a/activesupport/lib/active_support.rb b/activesupport/lib/active_support.rb
index 3372fb853a..4444268997 100644
--- a/activesupport/lib/active_support.rb
+++ b/activesupport/lib/active_support.rb
@@ -35,7 +35,6 @@ module ActiveSupport
 end
 
 require 'active_support/autoload'
-require 'active_support/vendor'
 
 require 'active_support/vendor/i18n'
 I18n.load_path << "#{File.dirname(__FILE__)}/active_support/locale/en.yml"
diff --git a/activesupport/lib/active_support/vendor.rb b/activesupport/lib/active_support/vendor.rb
deleted file mode 100644
index 5c79c6a420..0000000000
--- a/activesupport/lib/active_support/vendor.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# Fakes out gem optional dependencies until they are fully supported by gemspec.
-# Activate any optional dependencies that are available.
-if defined? Gem
-  begin
-    gem 'builder', '~> 2.1.2'
-  rescue Gem::LoadError
-  end
-
-  begin
-    gem 'memcache-client', '>= 1.6.5'
-  rescue Gem::LoadError
-  end
-
-  begin
-    gem 'i18n', '~> 0.1.3'
-  rescue Gem::LoadError
-  end
-end
diff --git a/activesupport/lib/active_support/vendor/builder.rb b/activesupport/lib/active_support/vendor/builder.rb
index ad89e6635d..349825f438 100644
--- a/activesupport/lib/active_support/vendor/builder.rb
+++ b/activesupport/lib/active_support/vendor/builder.rb
@@ -1,6 +1,7 @@
 begin
-  require 'builder'
-rescue LoadError
-  $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'builder-2.1.2', 'lib'))
-  retry
+  gem 'builder', '~> 2.1.2'
+rescue LoadError, NoMethodError
+  $LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/builder-2.1.2/lib")
 end
+
+require 'builder'
diff --git a/activesupport/lib/active_support/vendor/i18n.rb b/activesupport/lib/active_support/vendor/i18n.rb
index 6011253035..05c03277e3 100644
--- a/activesupport/lib/active_support/vendor/i18n.rb
+++ b/activesupport/lib/active_support/vendor/i18n.rb
@@ -1,6 +1,7 @@
 begin
-  require 'i18n'
-rescue LoadError
-  $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'i18n-0.1.3', 'lib'))
-  retry
+  gem 'i18n', '~> 0.1.3'
+rescue LoadError, NoMethodError
+  $LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/i18n-0.1.3/lib")
 end
+
+require 'i18n'
diff --git a/activesupport/lib/active_support/vendor/memcache.rb b/activesupport/lib/active_support/vendor/memcache.rb
index 442f50a817..878464f6db 100644
--- a/activesupport/lib/active_support/vendor/memcache.rb
+++ b/activesupport/lib/active_support/vendor/memcache.rb
@@ -1,6 +1,7 @@
 begin
-  require 'memcache'
-rescue LoadError
-  $:.unshift File.expand_path(File.join(File.dirname(__FILE__), 'memcache-client-1.7.5', 'lib'))
-  retry
+  gem 'memcache-client', '~> 1.7.5'
+rescue LoadError, NoMethodError
+  $LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/memcache-client-1.7.5/lib")
 end
+
+require 'memcache'
diff --git a/activesupport/lib/active_support/vendor/tzinfo.rb b/activesupport/lib/active_support/vendor/tzinfo.rb
index cc4f086edf..0d47361d97 100644
--- a/activesupport/lib/active_support/vendor/tzinfo.rb
+++ b/activesupport/lib/active_support/vendor/tzinfo.rb
@@ -1,6 +1,6 @@
 begin
   gem 'tzinfo', '~> 0.3.13'
-rescue Gem::LoadError
+rescue LoadError, NoMethodError
   $LOAD_PATH.unshift File.expand_path("#{File.dirname(__FILE__)}/tzinfo-0.3.13/lib")
 end