This reverts commit ea7d086e. The revert did not fix the flakiness.
Attach a file by drag & drop or click to upload