this old way was a very strange way of doing things.  We should definitely come up with a good, consistent way of doing this (it's on the tech debt trello).  Maybe as part of the dispatcher or something.  Worth having a conversation about.