Revert because breaking migration tests. This reverts commit 95893ffebd2928356a73ae536f081aa080230c72.