PLEASE NOTE: This MR is base on !275 (closed)
This reverts the introduced changes for the data migration.