Revert "Fix up expanded desktop behaviour."

This reverts commit 8b04baf3b7358953e819346da9c7c432e23f4276.