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

This reverts commit 781f063358049ab9551668968e338d9151291867, reversing
changes made to 88addc07b5657d6aa5d6532e7eb048cfbe0bf881.