This reverts commit a3174c42.

Issue-Ref: 3708
Issue-Url: https://af3-developer.fortiss.org/issues/3708



Signed-off-by: Simon Barner <barner@fortiss.org>