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