eb2934f0c1
continuation of the changes from eaaf05a7cc
this further simplifies, enables this for gateway deployments as well