ruby: fix conflicts from cherry-pick