This reverts commit e9cfb628. The mesa commit causing the failures was reverted and the bug was closed. mesa/mesa!743