The backports of a [bugfix][1] for migrations to [7-0-stable][2] and
[6-1-stable][3] ended up including another [change][4] from main, which
is now causing CI to fail for those stable branches.

This commit fixes the CI issues by un-including the additional change
from main.

An alternative to this fix would be to backport the test changes from
the additional commit, but since it changes error messages it seems
better to leave that on the main branch.

[1]: 11aaa3db
[2]: e2a99b56
[3]: 33a92775
[4]: 39a20095