This is causing cyclic import pain. Remove it, rather than port it to the newer migration infrastructure. This means that users must run the migration before upgrading to the any version which includes this change.