Revert "[rubygems/rubygems] [Require] Ensure -I beats a default gem"

This reverts commit 00cd5d74cecb6aa4a184e57e2b8246ef6e45d458.

2 files changed, 0 insertions, 21 deletions

diff --git a/lib/rubygems/core_ext/kernel_require.rb b/lib/rubygems/core_ext/kernel_require.rb
index 5986e356bc..8c85ef79fc 100755
--- a/lib/rubygems/core_ext/kernel_require.rb
+++ b/lib/rubygems/core_ext/kernel_require.rb
@@ -36,26 +36,6 @@ module Kernel
 
     path = path.to_path if path.respond_to? :to_path
 
-    resolved_path = begin
-      rp = nil
-      $LOAD_PATH[0...Gem.load_path_insert_index || -1].each do |lp|
-        Gem.suffixes.each do |s|
-          full_path = File.expand_path(File.join(lp, "#{path}#{s}").untaint)
-          if File.file?(full_path)
-            rp = full_path
-            break
-          end
-        end
-        break if rp
-      end
-      rp
-    end
-
-    if resolved_path
-      RUBYGEMS_ACTIVATION_MONITOR.exit
-      return gem_original_require(resolved_path)
-    end
-
     if spec = Gem.find_unresolved_default_spec(path)
       begin
         Kernel.send(:gem, spec.name, "#{Gem::Requirement.default}.a")
diff --git a/lib/rubygems/test_case.rb b/lib/rubygems/test_case.rb
index 4b43df539d..b6bb7ca93e 100644
--- a/lib/rubygems/test_case.rb
+++ b/lib/rubygems/test_case.rb
@@ -739,7 +739,6 @@ class Gem::TestCase < (defined?(Minitest::Test) ? Minitest::Test : MiniTest::Uni
     spec.files = files
 
     lib_dir = File.join(@tempdir, "default_gems", "lib")
-    lib_dir.instance_variable_set(:@gem_prelude_index, lib_dir)
     $LOAD_PATH.unshift(lib_dir)
     files.each do |file|
       rb_path = File.join(lib_dir, file)