Revert "Revert "Merge pull request #960 from dimagi/fd-types-cleanup""

This reverts commit b7db27efb3d1307ad7754ba66876cc724f5b8662.
Merge pull request #963 from dimagi/fd-types-cleanup

Revert "Revert "Merge pull request #960 from dimagi/fd-types-cleanup""