Shouldn't we drop it then for all transports (possibly in a separate checkin)?