is this needed for your diff? If not, I'd love it in a different PR.