Fix #7554 - performance on import of langs