This reverts commit dc205b3f9530ab8f25b9d8fdbe0fd942fcfc750e. Change-Id: I6ed27c1eb8ddd1894bf0374b989a1b4e3d7761a3