Revert "Support expanded desktop"

This reverts commit f8ce7fd09b7b67b6979f196296733b317366c2a4.