This reverts commit a821ac4c.

That patch is not suitable for 3.18.
Reported-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>