Removed hard-coding of en-us as locale