Merge pull request #65 from gary-pei/master

Revert "Fix migration"