Partially revert !10899

Merge request reports

Loading