Switch back to original x509 library

Fixes #57