Revert 7b525ae..41b902b

This rolls back to commit 7b525aec6338aa1f998524fde191b13ec58a797f.
orvalho quase finalizada