Remove duplicate winchan

This pull request depends on PR #3758.

/cc @jrgm