Revert "Merge pull request #164 from scj7t4/MigrationFix"

This reverts commit 036ec0c9e7e623dfe593fda9d776caaaf30c20fc, reversing
changes made to 412300b3edd07231181b7a0da5ac8439b0e32a4e.