Revert "Merge branch 'T6863' into '15.0-preStable'"

Merged Macarena Meldi requested to merge revert-4375ad26 into 15.0-preStable

This reverts merge request !1107 (merged)

Merge request reports