Move back to having ugettext