Revert "Merge pull request #1148 from runrevsebastien/bugfix-13374"

This reverts commit 00b564c79e03e626b4d1380c7596ba2f441c17a3, reversing
changes made to 264107fb9b02fd0ef80948bfe0fd1b7edeffb79d.
Merge branch 'master' into release-6.6.4