This reverts commit a1e5fc68 (which is
a botched cherry-pick), to be replaced with a fixed backport.
Signed-off-by: Kamal Mostafa <kamal@canonical.com>