Revert "[#2075] password recovery utility"