Revert "Auto merge of #25898 - jdm:rustup, r=asajeffrey" …
This reverts commit ea8aed1, reversing changes made to 3749eb5.