This reverts commit d77dbb42. Bug: 72379138 Bug: 116174409 Change-Id: I57ce41b2ec151807ce2cf43f0bd22859a0c7d17d