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