performance improvement for packages with many services, patch from jeff finucane, RT#23900