This reverts commit b620dc60. (cherry picked from commit 128db962) Change-Id: I21227e6232c925a42597e5c8fc0fcc0585d7a876