Note: this is migration 640 because I'm hoping to merge #981, which takes migration 639, before this one.