This lets us continue to support older Xorg releases. This reverts 4f37cd85 and partially reverts 4a43bd43.