BugLink: http://bugs.launchpad.net/bugs/1764666
CVE-2017-16995

This reverts commit 04e1c8db to be
replaced by its upstream version in 4.4.123.
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>