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