This reverts commit 48af5aeeba.
No idea on how this simple CL can cause this problem but A/B tests
and bisection show that the problem disabpears when reverted.
Bug: 129721367
Test: no repro on build with revert.
Change-Id: I13e3d788d255c4b6e873bb1e9ce2cf92d2a18e41