Revert "Merge branch 'master' into lhnam-AL2951-forgot-password-page"

This reverts commit 73631b9175e0279dae4904f242ec6dbf40e34e32, reversing
changes made to edc00e86f596d3e8ac62f329e31c68aede76ab12.