Partial backport of upstream patch.`` Signed-off-by: Rosen Penev <rosenp@gmail.com> (cherry picked from commit 3bfbb7d1db)
3bfbb7d1db