BugLink: http://bugs.launchpad.net/bugs/1764627

This reverts commit c86bfc7b which was
commit 74402055 upstream.

The backport merged incorrectly, so I'm dropping it.
Reported-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Cc: Adam Ford <aford173@gmail.com>
Cc: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>