I'm getting something like https://bugs.freedesktop.org/show_bug.cgi?id=52136 This reverts commit 5674fb556b.
5674fb556b