Revert "split the migration into two"

This reverts commit 70cff707355143b73ca0d66ee26a79c60e5edf78.
don’t remove the gravatar_id for now

still don’t understand all the structure.sql changes
need to dive in deeper after