Fix upstream merge conflict on 3267719797fe
Merging upstream commit 3267719797fe 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 66e5a062db025f98538e5c33deeccbad241c5326 && \
hg topic upstream-merge && \
hg merge 3267719797fe930ab9dbed2663854b3b83e46c15