- Re add BouncyCastle since it seems to cause all sorts of issues.