I think this fixes one specific case that I’ve happened to hit, but we probably shouldn’t fork