Revert for now "Commit WIP BROKEN login functions."

This reverts commit 10c39cd317b202e3ff46c3e0700c4b0376bceed3.