This reverts commit 1746369a6bcd1a7219e94366b3774bfdfff08fc6. Change-Id: I4989e99b8f648145d0dbfe18e557102939e7d1e3