Given that this was removed from 1.10 (because of the var incompatibility), can this Ask be re-opened and the original patch be reconsidered? Adding the var seems to be an issue, but changing `str` to `pr-str` is minimally invasive while solving the issue at hand.