[ros-diffs] [CVS reactos] revert my temporary class hacks and remove my desktop handling changes temporarily as they cause some trouble