Revert to calling plain utils instead of their __rvm_ functions in some places