Revert "Merge pull request #1029 from jfunez/999_other_role_and_i18n"

This reverts commit f8d3e87a11d768788c3edc4c3ed28521d77869e2, reversing
changes made to 7b2c82393006b3bd9372a7764d7311336d82e22b.