Revert last commit

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