Merge "Revert "Revert "WindowList be gone!"""