properties.remove("PasswordCipher");
} else {
String password = properties.getProperty("Password");
if (passwordCipher != null) {
try {
final PasswordCipher cipher = BasicDataSourceUtil.getPasswordCipher(passwordCipher);
final String plainPwd = cipher.decrypt(password.toCharArray());
converted.setProperty("password", plainPwd);
// all went fine so remove it to avoid errors later
properties.remove("PasswordCipher");
properties.remove("Password");