Still flakes on our tests. This reverts commit 727d6dff. Change-Id: If14076ba9fe91934294c24a23f53d55d88d76fb7