This reverts commit cc9020f7 to be
replaced by the upstream patch set.

CVE-2017-1000364
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>