This breaks BC. Delegators that are defined as services won't work anymore. While that's the required behavior, we can't break BC here.