The test still have some flakiness in it which didn't reproduce locally. This reverts commit 500c9be1. Change-Id: I132aff62bf03c2f926aafde6869707573bae9b36