ETRO-3 removed bad imports and switched back security switch