This was actually fixed by [697457bc] but then [952a943a] came which made it useless.
Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>
(cherry picked from commit 7c39ad95)