[AddressingBundle] Don't force to set scopes on zones

Fixes #1940.