Improve language choice

Fixes #1480

Change-Id: I45d26cd329c8c358852dc759270ffbac54728d27