[DF-185] Revert merge