Revert "One more try..."

This reverts commit 81ec1a453dd23e01cedcadf6e68e946996bf7728.
Revert "Try to work around misbehaving migration"

This reverts commit f9036faaacb29084f140979c8534698a85160926.