This reverts commit 16eb853f. The test is failing on some Linux build bots. See the review for an example.