Revert "[WIP] Multi-window (updated to patch 23)"

This reverts commit bbecb9f7ba9257f10d90f540f0b9df6e3a7c9519.
Revert "Fix for Multi-Window build"

This reverts commit 2e5594602217d53016b6a83d0967c5df49ef7ba7.
Revert "Fix for Multi-Window build"

This reverts commit ed8d2f44a0f0bcab6796d797875b84128b16ed78.
Revert "[WIP] Multi-window"

This reverts commit d458eaaf764e90f3a9966ae3d22136ac405aec05.