- Revert "Add support for proper plural translation" (#1685)