PIM-2330: Use qb agnostic