Bug: 30951794 Still flaky. This reverts commit df54ac58. Change-Id: I0ad415224921f0a0ed9bb6d1a7a9b3da39a8afc0