This reverts commit 234497b022c464532976b8a12614819bcf67f41b.

Patch were wrongly applied.
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>