if this is useful change then it should go in its own PR.