Revert to basic version

Signed-off-by: guillermo.herrero <xhirosh@gmail.com>