Revert "Merge branch 'T7159' into '17.0'"

Merged Pablo Ferreira requested to merge revert-8edf2123 into 17.0

This reverts merge request !3 (merged)

Merge request reports