This reverts commit 8ebf4049. Bug: 27672362 Bug: 36496960 Change-Id: Id04623a400c30f3c9b218806c118c5e4ffada020