Revert Emergency Fixes

Revert Fixes Made by Bryan for SendGrid Limit Exceeded Issue