Fix upstream merge conflict on efbc75191809
Merging upstream commit efbc75191809 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 b7bfb18097a1d7c938abf0ca8dab0de52655cb7f && \
hg topic upstream-merge && \
hg merge efbc75191809c596f60ff033bf3246eb33735957