Revert "[3.0] Fix for multi-language support."