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

This reverts commit ca38faf8fccbabf15197e11b440e2d7b57358fb6.