So what I was afraid of isn't actually the current behavior. I'm gonna look into this later when doing orgs stuff and decide whether to remove this in a different commit