This reverts commit 323c02b0.

CVE-2017-5754

BugLink: http://bugs.launchpad.net/bugs/1756121Signed-off-by: Juerg Haefliger <juergh@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>