Merge "languages: Partial revert of I8287118cf8ec01326ead9"