Changing the structure of credentials that are already in the
wild is a Bad Idea.

This reverts commit b44e018a.