Auto-Upgrade Stability

[jacob314]

Fix critical regression where the auto-upgrade process corrupts the installation, forcing the user to perform a full manual reinstall.

[scidomino]

I believe this was a dupe of #10305 which I fixed in #14595