Re-add code to make NVIDIA cards work with the updated device manager. Commit amended by Adam Honse <[email protected]>