Revert https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4580