Upstream sent patch. Signed-off-by: Rosen Penev <rosenp@gmail.com> (cherry picked from commit e35467459b)
e35467459b