All call sites that use this have been removed. This was only introduced as a stopgap until we could refactor more code to not use args everywhere, and that has now been achiveved. As such, remove this so it doesn't get used in more locations.

This depends on !2441 (merged) and !2346 (merged) first being merged.