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

This reverts commit c5c075dfd8b3d71a6a3a3c2c926ab1ba7bc9c9ce.