#5223 removed dispatcher