OK, I was able to install Mesa system wide, glxinfo tells me this:

Mesa 19.0.0-devel (git-8daf5bb209)

Which is the commit prior to the bad commit I mentioned above.

Sadly xterm is still breaking as usual, the output disappears as I Shift+Page
Up and nothing changed in that regard. :(