Revert "Changes to audio and video drivers"

This reverts commit 3a1fd601bc42ae841caab59e584dd280bb78ffb2.