This reverts commit 08df4b3d. (cherry picked from commit 3654a6f5) Change-Id: If8befd7c7135b9dfe3d3e9111768aba89aaa0863