Revert "merging ricardobeats"

This reverts commit a083e21f4b9e25411fc29b9dc43ca6a47dbd2a1d, reversing
changes made to 0bed7afd3d15e9db5722e00b4a6cad09815b9c68.