Reverting fix for RUBY-15995