This reverts commit 89e44684e0. On second thought, this change was not needed for the migration.
89e44684e0