This reverts commit 43eacdf6c41e78c1ca5b3410129c49cbd1e4fb3f. Change-Id: I3d1b63175df7435223b96b853ecd167b6524070e