Revert "Changes From TRI Tournament"

This reverts commit 3e904ed0a2a077f3f8ff67752f1837aea484e98f.