Cygwin Fix Again

Somehow I did not have the correct commit in my repository at the time the cygwin feature commit was pulled. So to not disturb the other contributors I made two commits that revert my faulty commit and Stephan's commit on top of that and then added the correct commit on top of that.