Revert xorg/xserver!235

Caused assertion failures / crashes with Xorg.

Closes: xorg/xserver#916
3 jobs for revert-235 in 8 minutes and 12 seconds (queued for 32 seconds)