Fix upstream merge conflict on f00e91bdd2fd
Merging upstream commit f00e91bdd2fd gives a conflict.
A human being has to perform merge and resolution for the automatic merge process to resume.
Command for clean conflict reproduction:
hg pull
hg --config command.update.check=abort update 43b3e2589523c2e990be9f6205f7817cf5a2e075 && \
hg topic upstream-merge && \
hg merge f00e91bdd2fdb87913034b600978e46242e591fb