I don't understand these macOS build failures. Looks like I fixed it again while trying to debug it with another MR against my own repository. Re-running it here then also fixed the build.
I honestly don't think we should keep build state across jobs like that.