This reverts commit fb896944. bug 32180327 Change-Id: Ic26bdffac6c56b102348f5393e6eb5d895960d7e (cherry picked from commit 23c8bab0)