Revert last commit

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