I'm happy with the suggestion :) But we need it as part of this patch.

I won't take an experience regression because we want to maintain a `comms` skin without touching code in the `communications` app.