new upstream, selectwnd patch no longer needed, applied upstream