This reverts commit a3ad450a. (cherry picked from commit 498eb18b) Change-Id: Iec7eab83d0c0ed1604e1e8ea3f9e9d0ce1d29680