Revert previous commit, sorry.

I forgot about capabilities, we can't just swap the preferred implementation like that.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5965 b64f7644-9d1e-0410-96f1-a4d463321fa5