Revert "Don't assume languages are 2 letter codes."

This reverts commit 75c9e83934c8d3fcea5d703e369438902e60329c.