Revert fix up expanded desktop behavior

Change-Id: I5813096334a45086a45f4679c30c904e9366e1b7