This reverts commit 217e7892. (cherry picked from commit f679fab9) Change-Id: I058dd461d97bc5992b69941c7597a0aca25df38c