Backport for an issue that affects fast forward upgrade. See bug #1571864 for more details.
Probably not strictly needed in 11 and unlikely to make the cut, closing, we can reopen if necessary.