no need to update gem itself after installation, and one cherri-pick

cherry-pick from cluster