Why did you remove this part of the conditional? We need to be able to use key_filename in addition to password.