I'm unable to build python-pivy with the suggested changes.  Here is the
actual diff I used: