Log Message:
mesalib: revert previous stopgap fix
I'm not sure what I tested, but it didn't work (since the llvm option
needs to be disabled as well).