This reverts commit 72f0c0f4.

[ kamal: 3.13-stable: to be replaced by Takashi backport ]
Signed-off-by: Kamal Mostafa <kamal@canonical.com>