Fix upstream merge conflict on a1c97c193fc2
Merging upstream commit a1c97c193fc2 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 023ff9b7e47dd3d5de195c9d38a253d009fcc427 && \
hg topic upstream-merge && \
hg merge a1c97c193fc2df770431add76a157eddd158bc90