Merge pull request #31453 from gcs278/OCPBUGS-63219-remove-hairpin-workaround