Revert r47196, r47219 "* (bug 13040) Gender-aware user namespace aliases" and followup