This reverts commit 74a575eb7296fb04e1fc2bd4e3f68dee3c66ee0a as it causes unexpected migrations and doesn't seem to be the best solution. Backport of 0595bca221825c0c6bd572a32f3bf9eff7069328 from master
This reverts commit 74a575eb7296fb04e1fc2bd4e3f68dee3c66ee0a as it causes unexpected migrations and doesn't seem to be the best solution. Backport of 0595bca221825c0c6bd572a32f3bf9eff7069328 from master