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