I'd be more comfortable if we had this as the default with a `--migrate` option to migrate it explicitly.