Revert "Merge branch 'nvidia-drivers'"

This reverts commit de098182890641196c8bccee02ecc1f8ac7319a4, reversing
changes made to 16ccee82515fa9291c2f9875c663bed9035ac5f6.