This reverts commit 74a575eb72 as it causes unexpected migrations and doesn't seem to be the best solution. Backport of 0595bca221 from master
74a575eb72
0595bca221
Thanks Tim Graham for the patch series review.