Signed-off-by: Rosen Penev <rosenp@gmail.com> (backported from 622176262d4b8093eda1704e052ae97d74c85c7f)