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