Undo changes from commit 28123de6556a0c4fab8cdd6a7cab30555611990e

Signed-off-by: Sabine Heider <sabine.heider@sap.com>