This reverts commit f594f811. Test: none Bug: 111330641 Bug: 117434628 Change-Id: Ia78e3360d5ae29ff32e89d504f120d2346b93c46
mentioned in commit bc0e3852