Revert "Squash expanded desktop commits"

This reverts commit 881ec635c96bc26f49e9bd31d40a413567de786f.