Changed from using StringPasswordEncryptor from Jasypt to pretty much the same, but using BouncyCastle.