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

This reverts commit a9a979ca to be
replaced by the upstream patch set from 4.4.130.
Signed-off-by: Juerg Haefliger <juergh@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>