This reverts commit b1b1d467 to be
replaced by the upstream stable variant.

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