Change feature gate visitor to use default visitor

Change feature gate visitor to use default visitor #3315