Can we add a TODO here to remove this once the conversation start/end stuff that calls it is gone?