Revert "Fix and cleanup Expanded Desktop Mode"

This reverts commit 54dc64820812993546be1748df0dd7bcd37b1bb8.