Revert "Restore expanded desktop setting"

This reverts commit 138706e0ef80a93516ff4c6190e07ec0ad145305.