Revert "Merge branch 'login'"

This reverts commit c09a8051201a9e55ea8d4373e4390b2eaa7cc39d, reversing
changes made to 9ed81544412708fd4cdc8e3ad1331bc7a98e740a.