Remove disallowed fields before resaving on migrations.

- TODO: fix this properly.