Add missing changes (#658)

It looks like we missed some key changes from the `1.7-dev-cryptography`
branch. This PR will put them back in. Thanks @JoeyLupo for pointing
that out!

Author: stevespringett