Rollback and Fix DI issues with L10n