Fix a merge conflict between mantis and IR cleanups Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>