Revert "Fix up expanded desktop behaviour."

This reverts commit e9274af703186de94daee3c5d2d65b648e0e7c55.