This is similar to a patch that was previously carried. Signed-off-by: Rosen Penev <rosenp@gmail.com> (cherry picked from commit 8bc32479ea)
8bc32479ea