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