Backport PR #3840

Change-Id: If4906504faade14ea6aa00bc1976e180179a58c1
Signed-off-by: Giuseppe Lavagetto <glavagetto@wikimedia.org>