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