Revert "Xprofile: De-duplicate envoy setup"

This reverts commit 593b2f866a5557a1978e3352d311829e57952b25.