This reverts commit a704eda0. Bug: 27417671 Bug: 30500547 Change-Id: Ieea05236b9e61c722660cd9497c9d55d13ccd010