Follow CRuby r40423