This reverts commit 63107a80. bug:22116987 (cherry picked from commit f9a19957) Change-Id: Ia516f2cbce6d22df37f3a0854abdd0b54d3ea72d