fixup to ae427f5654bf8492d6555783123acc89fa36e702
Merge pull request #4915 from cvrebert/patch-1

fix faulty merge commit