Revert "More flexible parsing of languages from strings"

This reverts commit 9caeb1905fc01386896bd4cfff8b5bc097d5e486.