Revert commit 02b0586c3c9a325f88717ae89adb6e9e4d005397

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