fix mismerge from upstream sync

Omitting changelog on purpose on this one, since it really
should have been embedded in the merge.

All credit go to Franck Jullien for noticing and pin-pointing
the issue so quickly.