BTW, the upgrade failed. Restoring from snapshot also failed. Looks like we need to do yet another complete wipe and reinstall.