Revert "Merge branch 'DBMigration'"

This reverts commit 0d2ce4115ce34fe1bb512ac613df0bb341f31006, reversing
changes made to 1e2f3cdfa7913847bb510f29335ad31988d3d39a.