This reverts commit 89f710f1. Reported by others for xorg-server to crash on different kernel versions.