Probably.  This was cherry-picked over from the webm branch.  I can fix these up to be consistent.