This reverts commit 5af67b32.

Change-Id: I0d758b038057af83df007c153a7baa23e974c7c0
Signed-off-by: sousaedu <eduardo.sousa@canonical.com>