Revert "Merge branch 'revert-8ce7124e' into 'azure/m16-master'"

This reverts merge request !690 (merged) Original PR: !683 (merged)

Reason for earlier revert: "Hunch" based revert for failures in a dataseeding task different from the one changed/updated in this PR.