IIRC @dpeek had added "window" here recently. What's the reason for removing it again?