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