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