Revert "Merge pull request #16628 from 6a68/bug-972645-reset-password"

This reverts commit e2427df4eaf5b0b7ae207b256a51436b5b80d769, reversing
changes made to 117b06a09a1e15ce19f21eaaf53a7fe187b233d8.