This reverts commit 3d1396d3.

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