This reverts commit c3549f96. Bug: 18281970 Bug: 18573576 Change-Id: Ib1547b531e4afd9b100d340cd17b0b78ae203ae1