Comment 1 for bug 1502458

This should be implemented into the carriers' conf. This will be easier to do once we have the one_tribe branch working, because then we won't be parsing with macros any more.