And removed our patch that has been applied upstream.
Close #5795

Pointed by Mangled Deutz
(cherry picked from commit 0bce8706)
Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>