Replace the code rather than remove it in fallback.
Merge branch 'feature/language-chooser' into develop