Revert "Merge branch 'T5255' into '17.0'"

Merged Javier Vescio requested to merge revert-258aa238 into 17.0

This reverts merge request !85 (merged)

Merge request reports