It seems like there have been a lot of gotchas in this upgrade process, so we'll have to make sure the upgrade scripts work well.