I broke it with rev 1864. This patch also removes whitespace at
line endings.

Reviewed-by: amishchenko