This reverts commit e925dc0b.
This commit is breaking more than it is fixing. Revert until I have a
working version of this migration.