Rejigged encrypted import so that the current password isn't changed

We still try the currently stored password. If that doesn’t work then
we prompt for a password, but we no longer store the password in the
store.