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