Comment 6 for bug 1859007

I did some testing today and I believe this was indeed resolved by the patch above.

Since it landed on the 2.8 series and was not back-ported, 2.8 -> 2.9 will be the first versions where upgrade-by-migration works for this scenario.