Gustavos's Revisions Over the weekend
Revert "Gustavos's Revisions Over the weekend"

This reverts commit 42be24c694d25c06d60f32193fb2c5f2fc5affba.