This reverts commit 70243d6e2f.
70243d6e2f
The last focused window was now window 1 - so we better make this explicit.