This restores the v0.7 to v0.8 migration.

Effectively reverts aeea03e362feb126a78659a92b77280d1e7c405c.