Revert "Merge branch 'T10043' into 'master'"

Joel Maglionirequested to merge
fix/revert-merge-T10043 into 17.0-test

This reverts commit 267ef544, reversing changes made to 47027c7f.

Merge request reports