This reverts commit aa39da8338. This turned out to cause issues when rebuilding test docker images. This will need further investigation, for now just revert it. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40850>
aa39da8338