This partially reverts commit ee1c3a4548. The migration files introduced by the commit have been kept since they have been run already on several enviornments.
ee1c3a4548