This reverts commit f37f12e1.

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