Revert 7844fe3
Revert 2b2013a
https://www.drupal.org/node/2366539 #2366539: Remove format_plural().