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

This reverts commit f068ccac.

The revert is in favor of cherry-picking the upstream commit, so the
rest of the patchset can apply.
Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>