This reverts commit b092864a39bbcd4f34c5c26a7cd0df90e235815d.

We will use the proper libX11 upstream patches now.