Revert "Settings: Add back expanded desktop settings.