fixing the revert

Change-Id: I9f9da1d694702bda5d53175d4fc33ac306b5442e