Revert "Revert "Remove Window:1""

This reverts commit 722795ab36fcd25035a25647c2e621dedaa68977.