Fix upgrade repropose

OK, too messy to touch now ™.