Revert "merge revision(s) 9f708d48f6df37ee9600db9d51b57a156609a13b,0301473fb523c71d8cdc4966971f31f502001185,7f0e26b7f99bf76408569892ce20318501f74729: [Backport #20516]"

This reverts commit 0de1ff12973ffc04bc9a8b0799e963922986d1eb.

2 files changed, 1 insertions, 14 deletions

diff --git a/tool/lib/bundled_gem.rb b/tool/lib/bundled_gem.rb
index 6633d3e0c4..38c331183d 100644
--- a/tool/lib/bundled_gem.rb
+++ b/tool/lib/bundled_gem.rb
@@ -6,16 +6,6 @@ require 'rubygems/package'
 # unpack bundled gem files.
 
 module BundledGem
-  DEFAULT_GEMS_DEPENDENCIES = [
-    "net-protocol", # net-ftp
-    "time", # net-ftp
-    "singleton", # prime
-    "ipaddr", # rinda
-    "forwardable", # prime, rinda
-    "ruby2_keywords", # drb
-    "strscan" # rexml
-  ]
-
   module_function
 
   def unpack(file, *rest)
@@ -45,9 +35,6 @@ module BundledGem
     gem_dir = File.join(dir, "gems", target)
     yield gem_dir
     spec_dir = spec.extensions.empty? ? "specifications" : File.join("gems", target)
-    if spec.extensions.empty?
-      spec.dependencies.reject! {|dep| DEFAULT_GEMS_DEPENDENCIES.include?(dep.name)}
-    end
     File.binwrite(File.join(dir, spec_dir, "#{target}.gemspec"), spec.to_ruby)
     unless spec.extensions.empty?
       spec.dependencies.clear
diff --git a/version.h b/version.h
index 5d96911a2d..805359030e 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 4
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 173
+#define RUBY_PATCHLEVEL 172
 
 #include "ruby/version.h"
 #include "ruby/internal/abi.h"