We tried, but something in the DB seemed to break schema migrations
so let's undo this for now while we focus testing on that part
specifically. Once that hurdle is past, we can revert this revert to
try again.
This reverts commit 7011082193.
Change-Id: I5f6628c1e4366184ac5b4f72c5aaf43207942bf9