Revert "Updated for our AGM use, esp. medical"

This reverts commit b372b283bc2aa1a1d925b015f54e3d4faebce653.