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