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