Patch to stop passing params where they're not needed