Revert last commit

Change-Id: I3a21f2925dd993ef76926959e88815c37648be1c
Signed-off-by: Iliyan Velichkov <iliyan.velichkov@sap.com>