Revert big refactoring of the last four days; to be redone more systematically

Joachim Wuttkerequested to merge
j.4 into main

This reverts commit 5c251b16.

Merge request reports