Fix for Upgrades breaking out of their sandbox

Fixed an issue where certain paths were expected to break out of the sandbox and back into the normal upgrade path.