Revert "Deleted last two migration changes that broke stuff"

This reverts commit cd723857c217ff78f4d1a423eceed6fdc4f08b55.
Revert "sigh"

This reverts commit 8f3d71b28b64d92df24c14b0dd35d5ffc8747c38.