[DF-2672] Reverted previous fix for defect. It was fixed it a better way with changes for DF-3909.