Fix migration introduced in 2a611833 (bug 1097428, bug 1098383)