This reverts commit 4e105385, reversing
changes made to 62b43839.

The change in Ruby that made those changes required was reverted in
https://bugs.ruby-lang.org/projects/ruby-trunk/repository/git/revisions/8852fa876039ed177fd5e867f36177d8a9ff411c