fix service add-ons RT#27974 / RT#28151, fallout from perf optimization #26097