This reverts commit dd63f717fe. Caused a crash at least on some systems. Closes: https://gitlab.freedesktop.org/xorg/xserver/issues/934
dd63f717fe