Don't break migration chain

Committing this straight to 2-2-dev since this is already included in my
commit that got accepted into upstream master.