This is a prerequisite for the next commit. Cc: 19.1 <mesa-stable@lists.freedesktop.org> (cherry picked from commit 0f1b070b)