Merge "Revert "composer: route binder traffic over vndbinder""