This reverts commit 94c907342a.
It introduced multiple errors and is to big to find the actual errors.
Fixes: #8342
Fixes: #8426
This reverts commit 94c907342a.
It introduced multiple errors and is to big to find the actual errors.
Fixes: #8342
Fixes: #8426