Revert "Fix and cleanup Expanded Desktop Mode"

This reverts commit 25ec70e412bc6cec4fe431b235f49999cc262318.