Revert commit

Change-Id: I701b01a46f708763402e3506e2980a8ad0240172