This reverts commit 3d93db25. (cherry picked from commit 7fa112be) Change-Id: I69837dd96f3cfd413682723351093a1e41292a1b