Issue #2241633 by sun: Simplify site-specific service overrides.