The upgrade shell should be updated for this change as well.