Revert "Esteban 534"

This reverts commit 15bde0a10dc88f7425fcc7c574106f70e2485d96.