Revert "Merge branch '5907-password-recover-does-not-escape-fields-in-error-messages' into '1.4-dev'"

This reverts merge request !420