Revert 9a80c58..50131be

This rolls back to commit 9a80c5849fc90fe9e3d679e5bef285e2d00041b6.
Authentication Going It