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