Shouldn't we only add to bobby if the policy type is a bobby type (or MaaS-type, or whatever)