Revert "Add flag for associating the ABCD unit with the field unit"
This reverts commit 55b1bb529f2938de88202fd3b51447cab3cc5b58.
Revert "Add flag for associating the ABCD unit with the field unit"
This reverts commit 55b1bb529f2938de88202fd3b51447cab3cc5b58.