Cygwin build fix after r189875