Mitigating #23726

PiperOrigin-RevId: 678213406
Change-Id: I99ea19f3dcf56a359e39274ce9043a6b4f64b6a4

Backporting
https://github.com/bazelbuild/bazel/commit/355b000accfff4ea29876a46321308fe9422a9d1#diff-544556920c45b42cbfe40159b082ce8af6bd929e492d076769226265f215832fR85