FEC-2243 ignore delivery type, should be based on protocol