Revert "Added aaron's changes"

This reverts commit d4606e6812c465b771a949330b2fd0e03936b120.