xorg: revert larger updates from master

I'll better be more conservative.