Merge "Revert "Make a hidden form field to keep the language code""