Apply update from r223213 to increase default window size (partial HPN revert)
Fix bad HPN patch duplicating code in channels.c:channel_check_window