Revert "Merge conflict fix"

FORNAZARIC FLORIANrequested to merge
revert-8c4894fd into master

This reverts commit 8c4894fd

Merge request reports