This reverts commit 1985071e, reversing
changes made to a901869c.

We autodetect libxcb, so this is not necessary.