[rollback changes from  SAT-362]