revert back broker switch logic