Revert "Merge branch 'DAR-2750' into DAR-2626"

This reverts commit b1dff2d59a89278b967e27ee03a6deed17c08647, reversing
changes made to 3c68efb4a7bf421b567d982abafd3261bf70d8ef.