Partial revert of rust upgrade.