Revert "Merge conflict fix"

Ghost Userrequested to merge
revert-063a1875 into master

This reverts commit 063a1875

Merge request reports