I believe these are re-run on upgrade, but I'll test.