This reverts commit ccf12480. (cherry picked from commit 27c590ed) Change-Id: I2be879dcd126fc8d043641bdfbf2f9b80a678d10