Doesn't seem like it still requires ```CurrentOrganization```.