This fixes a mismerge by @elmindreda in
65748fb8f316384cda39583a489c39ae80124305.

(cherry picked from commit efda4afb495be4779c152a96f7b3f52c54cbff32)