This reverts commit 3ddd7003
from 3.19-stable.

Patch is not suitable for 3.19-stable (breaks "make -C tools/vm").

Cc: Sasha Levin <sasha.levin@oracle.com>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>