Merge pull request #90366 from Snowy1803/remove-poison-refs