This change also reverts previous commit bc5422cf.

Change-Id: Ia72ce8677a8ebe15f15e6f79d8b158654393f93a
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>