This reverts commit e7a8f476ea3873941ace96751fa2d633c95b7c10. Change-Id: I457e45b0a536bbde721a3355ed860b2363e36467