(FWIW, We are blocked on pants releases until we accept a patch something like this. )