[T7269] revert T4610

Merged Pablo Ferreira requested to merge T7269 into 17.0

Merge request reports