revert recent patch to separate the windowing out into a thread