This reverts commit eb84064e14e8261be1aecc0b5bf77b5728902c31. Change-Id: I2ea6ea2e58de54142882324e44efa90d1c9ee639