Fixing language setting not sticking on 2.9.x branch.