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