BugLink: https://bugs.launchpad.net/bugs/1858489

This reverts commit fa1742ad in favor of
the upstream stable version.
Signed-off-by: Connor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>