[DF-2513] add forgotten refactoring