backported a part of a569bc09e25a2ba813d0bec1228d9ff65330a3db
picked up by Jeremy Evans [Backport #17305]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
backported a part of a569bc09e25a2ba813d0bec1228d9ff65330a3db
picked up by Jeremy Evans [Backport #17305]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67922 b2dd03c8-39d4-4d8f-98ff-823fe69b080e