Revert 3c1c6d8f7f80a242a822bae20435852e147db02a

Signed-off-by: Jorge Ruesga <jorge@ruesga.com>