Revert "Trying to distinguish more clearly between passphrases and passwords,"

This reverts commit 360fd974ac9e2999171acb55119f58617ee37cbf.