Revert "Merge branch 'login' into prog"

This reverts commit 3729919954fe297d2ec8420d2dde8c02ea7b6eb2, reversing
changes made to da7de7ba4d85a6d98513a8fb9d12b3e3716977b4.