Revert "Adding fix for REGISTRY-2251 - Handle regression issues caused by CARBON-14867"

Reverting merge since it was done before merging with the carbon kernel.