Can this be pushed upstream to the PUMA repo?