This reverts commit 3da74687. (cherry picked from commit 2e2db786) Change-Id: I38086cc9de939bad33bcd13b1677e1626af61c29