revert plurals handling code, embed quantities in context is useless and not working