Revert "Merge pull request #446 from sendgrid/develop"

This reverts commit 8fc1ab302336dbb3650bec7049b04009898101ec, reversing
changes made to 935e0568dec714d66af0bea9a36e26a74f87fe7b.