Revert "Add doNotPerformUpgrade setting" (#2305)