Revert "merge latest rb helper"

This reverts commit 5b2f14e4156b1ca3fa088e29db97e7634bf85408.
merge latest rb helper