cryptography bug
Revert fa3b4a0..81eec45

This rolls back to commit fa3b4a02990924683c3abf7d269c76a53a56f835.