Fixed a regression introduced by 28efafa2.
Thanks Michal Čihař for the report and initial patch, and
Collin Anderson and Tim Graham for the reviews.