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