Fix a mismerge from upstream master.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>