This reverts commit ded5aab1. Issue-Ref: 3507 Issue-Url: #3507 Signed-off-by: Simon Barner <barner@fortiss.org>