Preemptive migration fix for complex deployments

This small patch update splits a particularly troublesome migration into two migrations so that users with complex deployment setups are able to migrate without any special work.