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