Rreviewed-by: BBB Signed-off-by: James Almer <jamrial@gmail.com> (cherry picked from commit e4bfc9ec)