Revert "follow CRuby r44453,r44502"

Follow CRuby r44646.
This reverts commit cfc694e71994b21284f8632940fdef4e74e0a3d8.
This reverts commit 06c055dd75fe15c3b1b30aec27dc1ac79d8b414f.