Adapt to changes made to password-safe
Re-shrinkwrap'd