This reverts commit 1e08370814e8902074d59cc57f2b4c1a62f00ee8.

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