This reverts commit fe3b33d4ead06c546202753e38188db5e2eaa7fa. Change-Id: I3a9ae1f0d17e7a154d27d4f3f3eb1efa21a34f64