This reverts commit 6a80a4b0. Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593 (cherry picked from commit b3802812)