Added back and updated bouncycastle dep.