revert aldoreyes changes on master