83082f9ec2
This reverts commit 9d8c7871fc.
Reason for revert: may go away after b/282110579
Change-Id: Iccffb3794c43de48e90196213891644b46d2869b