Revert

Change-Id: I3c94bc68c062ce98d17575e6733a49946a63759b