Backported upstream patch. Signed-off-by: Rosen Penev <rosenp@gmail.com> (cherry picked from commit 39035df71c)
39035df71c