Replace global destination services more aggressively.

I'm not very happy with this approach, but want to see if going this
direction will help at all with build stability.