PyRRD upstream patch