Fix dropping plurals

Fixes #9020