Revert "Merge branch 'password_protected'"

This reverts commit 845d2b3c5ebdeffd3779ddf4ffae373b2bfae752, reversing
changes made to 34b9c5559ae269c2f9a48cb74e3e9500437f76ae.