Revert "Temp workaround for sonic-buildimage issue 23387 (#1629)"#1700

Pterosaur wants to merge 4 commits intosonic-net:mastersonic-net/sonic-sairedis:masterfrom

Pterosaur:revert_hft_disablePterosaur/sonic-sairedis:revert_hft_disableCopy head branch name to clipboard