Only works with some versions and seems to break with cygwin. I'm
working on using a recent upstream version + patches.

This reverts commit 848f165c.