Merge "Revert "WindowList be gone!""