Well, turns out I didn't properly account for addresses I deleted between then and now and I readded them all. Oops! Still don't have a good way to account for them short of not touching the data at all.