Revert "Keychain helper doesn't like clearing the password"

This reverts commit 105b8d00b5136b8c36bc7b6ad934b261799aecce.
Rebuild script/Boxen