Revert "Add back expanded desktop options."

This reverts commit a1a62f62d0169f4ba1466954427e3fde649a3ea4.