Yes, hence why I said I understand why it needs to remain opt-in. It still doesn't change the fact that it's a burdensome and inconvenient quirk.
Not that I have a better solution to propose either, mind. Feels like one of those things that just is what it is, an unfortunate downside of the federated design.