Fix handling of multi-step upgrades that need to happen in lock-step