Get rid of the non-HMAC version