Fixes #40038 (closed). I'll update when #40024 (closed) is done, but that should not block the review.