nit: I don't really see the benefit of this. Maybe as a test hook - but it doesn't really seem like we are leveraging it, so I would like to remove it.