This reverts commit daf58c80. Bug: 27621360 (cherry picked from commit e9dd04f6) Change-Id: I56fccf19ae80451be4c316ba14911c667cbe9e47