Revert "Merge branch 'Gabriela' into Beta-1.0"

This reverts commit 6eb7e4d77d8e0df64dec81ede0ec3495ce32655a, reversing
changes made to b25a1411715e099fd31174433a1608ed4ef33fe2.