This reverts commit 4730d3af.

Unfortunately, patch got mangled by a whitespace removal script.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>