Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com> (cherry picked from commit dda3f0ef48)
dda3f0ef48