revert several commits for expanded desktop support