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