[DF-4558] Revert all changes related to this defect. Another fix will be applied.