Fix upstream merge conflict on 27cd6c12a512
Merging upstream commit 27cd6c12a512 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 ffff041990e78ee0a97813443a7fa63dc3b29293 && \
hg topic upstream-merge && \
hg merge 27cd6c12a51283fe5cc97c2a536a32d0ca968257