Revert "Signed-off-by: Dshell <dshell@sap.com>"

This reverts commit 561cd5b365fd11c82b6eb0d845dc76951f8e4a86.