Remove duplicate password-making code.

There can be only one!

Change-Id: I54372b580c24f2a85dc47177e52c89217b58aef2