This reverts commit 2faaa445f9. Until libva is updated to version 2.3.0, need to go back to 1.8.x here.
2faaa445f9