Fix upstream merge conflict on fdc65519a614
Merging upstream commit fdc65519a614 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 64577203325419208669f893c48d773e02ad7f8b && \
hg topic upstream-merge && \
hg merge fdc65519a614439bbda78f4e579881f529fd98ff