Removing workarounds for allWindows problem