This reverts commit ccf12480. (cherry picked from commit 27c590ed) Change-Id: Id3f58a0e92bb7719d6099c7b288b8a33c2456c40