This reverts commit 21f778060badb1e78bffde05e8de7662d275003d. Change-Id: I65586f9739da84fb32b51b0ea166b8288c41d1b3