Merge "Revert "Map dummy language codes in sites""