Revert "CNI gate is failing because of trimpath (#17229)" (#17244)
Revert "CNI gate is failing because of trimpath (#17229)" (#17244)

This reverts commit 4847eaf302ff13a427bfa29ed0ebf67632c0d9a2.
smawson/istio,istio/istio,geeknoid/istio,smawson/istio,istio/istio,smawson/istio,geeknoid/istio,istio/istio,smawson/istio,istio/istio,istio/istio,smawson/istio,geeknoid/istio,smawson/istio,geeknoid/istio,geeknoid/istio,geeknoid/istio