This reverts commit c93551c6.

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