I think we should provide a migration tool for that and not handle the extra case.