Revert "Andrew's Commit"

This reverts commit 62992978a0d9c1a73037ad74dc2523a7a62271b3.