Youtube Bug-fix ported from old SVN - commit 3144