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

This reverts commit 013b832f in favor of
the upstream stable version.
Signed-off-by: Connor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>