Get rid of plurals disambiguation

(cherry picked from commit f77f7e97)
0 jobs for v21.07.80
latest