Apply r41148 again

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e