Revert "Remove Window:1"

This reverts commit 57f57a31d292bbe535ad2da7ff7ed95053d7cce7.