Revert bded979f on Cygwin, where it seems to be necessary