Reverting this as it is causing issues with our deployment. This should be restored once we have (a) a migration plan for existing data and (b) a rollout plan. ECOM-5086
