Revert

Change-Id: I8fe71529ea60a2336d917a385d14b0bd73402764