It will be useful for mesa >= 9.2.* Also, I want to restart the build on Hydra, as it succeeds for me.