This reverts commit 6a80a4b05acacd3fd07583a3bb6185e9770215eb. Change-Id: I21fc6802fd3eeca42492e07437bb71d54f015593