hack, please revert my commit and add a comment explaining why it's
needed because)

Thanks to http://forum.videolan.org/viewtopic.php?t=18285 for noticing.