Revert "attempts to fix error with json string parsing"

This reverts commit d3a998a26f70f78778a9c14192a0caa9a503e6ea.
Revert "first try at making new password format work"

This reverts commit 30333011fd0169fd3e1dd7a641dbd66d3c392979.