Revert "Some Expanded Desktop changes"

This reverts commit a0bd7f3ef89cf0e72d917859b66a888a700e2139.