This reverts commit 66a7f616 in favour
of the upstream stable commit.

BugLink: https://bugs.launchpad.net/bugs/1724836Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>