Reversed changes to ruby 2.1.1