Fix upgrading edge-ish case