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