This reverts commit fb3d6f2b77bdec75d45aa9d4464287ed87927866.

New, updated patch with same subject replaces this commit.
Signed-off-by: NJaroslav Kysela <perex@perex.cz>