Can we keep this method? That would break addons using it