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