Revert "Merge pull request #1 from ncq/newwin"

This reverts commit 30ca540067a6ff615699de11c4e5cc608064dc66, reversing
changes made to ca557da780559f67a19959940d9bfe089d544c69.