This reverts commit 178b64e75b.
The author misread the report of the failure, and thought that it broke
the CI again. Reland the fix.
This reverts commit 178b64e75b.
The author misread the report of the failure, and thought that it broke
the CI again. Reland the fix.