This reverts commit 240384b7. Reason for revert: P1 b/78360004 points to this so reverting for now (will triage later) Change-Id: I041c1d9fc045391c73e887268c3b1b9b69fcc216