Reverted 30626, it trashes Linux multi-desktop setups.