Revert "Merge branch 'jean.mainguy-master-patch-09797' into 'master'"

This reverts merge request !17
2 jobs for revert-b0745a37