https://github.com/jplehr approved this pull request. I validated that this should fix the issue we are still seeing on the bot. if it needs some other / more work, we can do this post merge. https://github.com/llvm/llvm-project/pull/227852