Fixup previous commit Now, it looks like this breaks Cygwin again. Have to figure out what's going on.