Revert "wsi/x11: Avoid a class of deadlocks in the WSI queue thread"

This reverts commit 272fba8e.

Multiple regressions have been reported against this. Let's revert and maybe try again.

Closes: #5910 (closed) Closes: #5913 (closed)

/cc @ajax