These changes were included when adding bundler plugin hooks for
`Bundler.require`, but they seem completely unrelated to that feature,
and have caused several issues.

https://github.com/rubygems/rubygems/commit/8d56551dcf