From 37a362c1a512dd93780bd100aba5093cbf7fae3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <deivid.rodriguez@riseup.net>
Date: Fri, 26 Apr 2019 20:02:43 +0200
Subject: [PATCH] Another attempt at fully removing the hack

---
 lib/bundler/version.rb | 22 +---------------------
 1 file changed, 1 insertion(+), 21 deletions(-)

diff --git a/lib/bundler/version.rb b/lib/bundler/version.rb
index 9a6e71f59c9..945b0b0787c 100644
--- a/lib/bundler/version.rb
+++ b/lib/bundler/version.rb
@@ -3,27 +3,7 @@
 require_relative "rubygems_integration"
 
 module Bundler
-  if Bundler.rubygems.has_bundler_version_finder?
-    VERSION = "2.1.0.pre.1".freeze
-  else
-    # We're doing this because we might write tests that deal
-    # with other versions of bundler and we are unsure how to
-    # handle this better.
-    VERSION = "2.1.0.pre.1".freeze unless defined?(::Bundler::VERSION)
-
-    def self.overwrite_loaded_gem_version
-      begin
-        require "rubygems"
-      rescue LoadError
-        return
-      end
-      return unless bundler_spec = Gem.loaded_specs["bundler"]
-      return if bundler_spec.version == VERSION
-      bundler_spec.version = Bundler::VERSION
-    end
-    private_class_method :overwrite_loaded_gem_version
-    overwrite_loaded_gem_version
-  end
+  VERSION = "2.1.0.pre.1".freeze
 
   def self.bundler_major_version
     @bundler_major_version ||= VERSION.split(".").first.to_i