Revert

Felix Sagerrequested to merge
revert-8255246c into development

This reverts commit 8255246c

Merge request reports