Since this is done elsewhere pretty often, this should be done in another PR.