Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit d7e4901bea30333f151de763ae72eaff9984e1e9)